diff options
| author | lloyd <[email protected]> | 2012-01-28 07:09:26 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-01-28 07:09:26 +0000 |
| commit | ee7f6c030776c17a47e9d4f12e59aad86366e0da (patch) | |
| tree | a1a613ca624268f709b4e10ce474b2b4fc7e604f /src/tls/tls_magic.h | |
| parent | ada0998533c7b6b8eb782c494f8efdf5b6f7f712 (diff) | |
Add Camellia ciphersuites from RFC 4132.
Fix Ciphersuite_Preference_Ordering which treated two ciphersuites
with the same algos but different keylengths as equivalent, causing
them to be lost. Always prefer the longer key.
Diffstat (limited to 'src/tls/tls_magic.h')
| -rw-r--r-- | src/tls/tls_magic.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tls/tls_magic.h b/src/tls/tls_magic.h index dced09964..72a430bf2 100644 --- a/src/tls/tls_magic.h +++ b/src/tls/tls_magic.h @@ -64,6 +64,8 @@ enum Ciphersuite_Code { TLS_RSA_WITH_AES_256_CBC_SHA = 0x0035, TLS_RSA_WITH_AES_128_CBC_SHA256 = 0x003C, TLS_RSA_WITH_AES_256_CBC_SHA256 = 0x003D, + TLS_RSA_WITH_CAMELLIA_128_CBC_SHA = 0x0041, + TLS_RSA_WITH_CAMELLIA_256_CBC_SHA = 0x0084, TLS_RSA_WITH_SEED_CBC_SHA = 0x0096, TLS_RSA_WITH_IDEA_CBC_SHA = 0x0007, @@ -72,6 +74,8 @@ enum Ciphersuite_Code { TLS_DHE_DSS_WITH_AES_256_CBC_SHA = 0x0038, TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 = 0x0040, TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 = 0x006A, + TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA = 0x0044, + TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA = 0x0087, TLS_DHE_DSS_WITH_SEED_CBC_SHA = 0x0099, TLS_DHE_DSS_WITH_RC4_128_SHA = 0x0066, @@ -80,6 +84,8 @@ enum Ciphersuite_Code { TLS_DHE_RSA_WITH_AES_256_CBC_SHA = 0x0039, TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 = 0x0067, TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 = 0x006B, + TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA = 0x0045, + TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA = 0x0088, TLS_DHE_RSA_WITH_SEED_CBC_SHA = 0x009A, TLS_ECDHE_ECDSA_WITH_RC4_128_SHA = 0xC007, |