diff options
| author | Hubert Kario <hkario@redhat.com> | 2014-07-23 15:03:59 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-08-15 23:41:20 +0100 |
| commit | 750487899ad2b794078ed998b513a4a14f60f2cc (patch) | |
| tree | 61a3fe1fbd00c9f14ed6eb6c14448f239f33d15c /ssl/s3_lib.c | |
| parent | f2be92b94dad3c6cbdf79d99a324804094cf1617 (diff) | |
Add support for Camellia HMAC-Based cipher suites from RFC6367
While RFC6367 focuses on Camellia-GCM cipher suites, it also adds a few
cipher suites that use SHA-2 based HMAC that can be very easily
added.
Tested against gnutls 3.3.5
PR#3443
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 121 |
1 files changed, 121 insertions, 0 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index a4fa1ea4de..6504487c45 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3033,6 +3033,127 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[]={ 256, }, +#ifndef OPENSSL_NO_CAMELLIA + { /* Cipher C072 */ + 1, + TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256, + TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256, + SSL_kECDHE, + SSL_aECDSA, + SSL_CAMELLIA128, + SSL_SHA256, + SSL_TLSV1_2, + SSL_NOT_EXP|SSL_HIGH, + SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, + 128, + 128 + }, + + { /* Cipher C073 */ + 1, + TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, + TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, + SSL_kECDHE, + SSL_aECDSA, + SSL_CAMELLIA256, + SSL_SHA384, + SSL_TLSV1_2, + SSL_NOT_EXP|SSL_HIGH, + SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, + 256, + 256 + }, + + { /* Cipher C074 */ + 1, + TLS1_TXT_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256, + TLS1_CK_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256, + SSL_kECDHe, + SSL_aECDH, + SSL_CAMELLIA128, + SSL_SHA256, + SSL_TLSV1_2, + SSL_NOT_EXP|SSL_HIGH, + SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, + 128, + 128 + }, + + { /* Cipher C075 */ + 1, + TLS1_TXT_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, + TLS1_CK_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, + SSL_kECDHe, + SSL_aECDH, + SSL_CAMELLIA256, + SSL_SHA384, + SSL_TLSV1_2, + SSL_NOT_EXP|SSL_HIGH, + SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, + 256, + 256 + }, + + { /* Cipher C076 */ + 1, + TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256, + TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256, + SSL_kECDHE, + SSL_aRSA, + SSL_CAMELLIA128, + SSL_SHA256, + SSL_TLSV1_2, + SSL_NOT_EXP|SSL_HIGH, + SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, + 128, + 128 + }, + + { /* Cipher C077 */ + 1, + TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384, + TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384, + SSL_kECDHE, + SSL_aRSA, + SSL_CAMELLIA256, + SSL_SHA384, + SSL_TLSV1_2, + SSL_NOT_EXP|SSL_HIGH, + SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, + 256, + 256 + }, + + { /* Cipher C078 */ + 1, + TLS1_TXT_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256, + TLS1_CK_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256, + SSL_kECDHr, + SSL_aECDH, + SSL_CAMELLIA128, + SSL_SHA256, + SSL_TLSV1_2, + SSL_NOT_EXP|SSL_HIGH, + SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256, + 128, + 128 + }, + + { /* Cipher C079 */ + 1, + TLS1_TXT_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384, + TLS1_CK_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384, + SSL_kECDHr, + SSL_aECDH, + SSL_CAMELLIA256, + SSL_SHA384, + SSL_TLSV1_2, + SSL_NOT_EXP|SSL_HIGH, + SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384, + 256, + 256 + }, +#endif /* OPENSSL_NO_CAMELLIA */ #endif /* OPENSSL_NO_ECDH */ |