diff options
| author | Jack Lloyd <[email protected]> | 2017-08-22 16:05:45 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-08-22 16:05:45 -0400 |
| commit | 11561110dee4d09fd65119592c8ed44a2f1dd983 (patch) | |
| tree | 24d5d4ab59cc08f155513682a0d9e7296799ab33 /src/scripts/tls_suite_info.py | |
| parent | 4b648818ef75b565ef55611cf9207d9d9cec70b0 (diff) | |
Add support for ECDHE_PSK AEAD ciphersuites
From draft-ietf-tls-ecdhe-psk-aead-05, now with official codepoints.
Diffstat (limited to 'src/scripts/tls_suite_info.py')
| -rwxr-xr-x | src/scripts/tls_suite_info.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/scripts/tls_suite_info.py b/src/scripts/tls_suite_info.py index 6dd623331..ce069e250 100755 --- a/src/scripts/tls_suite_info.py +++ b/src/scripts/tls_suite_info.py @@ -3,7 +3,7 @@ """ Used to generate lib/tls/tls_suite_info.cpp from IANA params -(C) 2011, 2012, 2013, 2014, 2015, 2016 Jack Lloyd +(C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 Jack Lloyd Botan is released under the Simplified BSD License (see license.txt) """ @@ -44,6 +44,9 @@ def to_ciphersuite_info(code, name): if mac_algo == '8' and cipher[-1] == 'CCM': cipher = cipher[:-1] mac_algo = 'CCM_8' + elif cipher[-2] == 'CCM' and cipher[-1] == '8': + cipher = cipher[:-1] + mac_algo = 'CCM_8' if mac_algo == 'CCM': cipher += ['CCM'] @@ -125,7 +128,7 @@ def to_ciphersuite_info(code, name): mode = cipher[-1] if mode not in ['CBC', 'GCM', 'CCM(8)', 'CCM', 'OCB']: - print "#warning Unknown mode %s" % (' '.join(cipher)) + print "#warning Unknown mode '%s' for ciphersuite %s (0x%d)" % (' '.join(cipher), name, code) ivlen = 8 if cipher_algo == '3DES' else 16 |