diff options
| author | lloyd <[email protected]> | 2014-11-03 23:08:58 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2014-11-03 23:08:58 +0000 |
| commit | 85e0f9510fde42905e8d4883614ca1920a914c30 (patch) | |
| tree | d4abfd9b004870c59330ff7424dabc323d112669 /src/scripts | |
| parent | bcd83686c3daed38974d1f9b533c07d35c5a7476 (diff) | |
Cleanup handling of TLS AEAD nonce sizes, push all knowledge of what
the nonce sizes should be down to the ciphersuite generating script.
Diffstat (limited to 'src/scripts')
| -rwxr-xr-x | src/scripts/tls_suite_info.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/scripts/tls_suite_info.py b/src/scripts/tls_suite_info.py index 48560f617..31bc70a4f 100755 --- a/src/scripts/tls_suite_info.py +++ b/src/scripts/tls_suite_info.py @@ -128,13 +128,14 @@ def to_ciphersuite_info(code, name): cipher_algo += '/' + mode if cipher_algo in stream_ciphers or mode == 'CBC': - return 'Ciphersuite(0x%s, "%s", "%s", "%s", %d, %d, "%s", %d)' % ( + return 'Ciphersuite(0x%s, "%s", "%s", "%s", %d, %d, 0, "%s", %d)' % ( code, sig_algo, kex_algo, cipher_algo, cipher_keylen, ivlen, mac_algo, mac_keylen[mac_algo]) else: imp_iv_len = 4 + exp_iv_len = 8 - return 'Ciphersuite(0x%s, "%s", "%s", "%s", %d, %d, "AEAD", %d, "%s")' % ( - code, sig_algo, kex_algo, cipher_algo, cipher_keylen, imp_iv_len, 0, mac_algo) + return 'Ciphersuite(0x%s, "%s", "%s", "%s", %d, %d, %d, "AEAD", %d, "%s")' % ( + code, sig_algo, kex_algo, cipher_algo, cipher_keylen, imp_iv_len, exp_iv_len, 0, mac_algo) def open_input(args): iana_url = 'https://www.iana.org/assignments/tls-parameters/tls-parameters.txt' |