diff options
| author | Jack Lloyd <[email protected]> | 2015-11-13 12:52:20 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-11-13 12:52:20 -0500 |
| commit | 406c57f09eac849c10807b74c8e7ba051a6a5c2c (patch) | |
| tree | fcb26fab346948c2647ff7db4144bb9d5ed07295 /src/lib/tls/tls_suite_info.cpp | |
| parent | 3dbcfb6297acfdb8818742acfb0fa9ffe70bcdbc (diff) | |
Add TLS_PSK tests
Fix a bug which rejected any short server key exchanges. These can
occur with a plain PSK with short or empty identity hints.
Disable SHA-224 by default.
Remove some vestigal RC4 cruft.
Push more on the TLS corruption tests.
Diffstat (limited to 'src/lib/tls/tls_suite_info.cpp')
| -rw-r--r-- | src/lib/tls/tls_suite_info.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/tls/tls_suite_info.cpp b/src/lib/tls/tls_suite_info.cpp index cb5c1d4c5..5aff035b9 100644 --- a/src/lib/tls/tls_suite_info.cpp +++ b/src/lib/tls/tls_suite_info.cpp @@ -2,8 +2,8 @@ * TLS cipher suite information * * This file was automatically generated from the IANA assignments -* (tls-parameters.txt hash 4bc98b6f75ad5b63952b5f457fa7adbfef60f095) -* by ./src/scripts/tls_suite_info.py on 2015-05-11 +* (tls-parameters.txt hash 6a934405ed41aa4d6113dad17f815867741430ac) +* by ./src/scripts/tls_suite_info.py on 2015-11-13 * * Botan is released under the Simplified BSD License (see license.txt) */ @@ -57,9 +57,6 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) case 0xC081: // DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384 return Ciphersuite(0xC081, "DSA", "DH", "Camellia-256/GCM", 32, 4, 8, "AEAD", 0, "SHA-384"); - case 0x0066: // DHE_DSS_WITH_RC4_128_SHA - return Ciphersuite(0x0066, "DSA", "DH", "RC4", 16, 0, 0, "SHA-1", 20); - case 0x0099: // DHE_DSS_WITH_SEED_CBC_SHA return Ciphersuite(0x0099, "DSA", "DH", "SEED", 16, 16, 0, "SHA-1", 20); |