diff options
| author | lloyd <[email protected]> | 2012-01-28 03:06:16 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-01-28 03:06:16 +0000 |
| commit | aa00e2879f90562bb06146726a602685d6051b6f (patch) | |
| tree | ecea02a9bfa28e99e350acd8b3860bde141f73ea | |
| parent | 6e1544d590826b48aaf44273373a3fe58fa3df7d (diff) | |
Add anon SRP ciphersuites to the list, add missing _CBC on the
existing enum values.
| -rw-r--r-- | src/tls/tls_ciphersuite.cpp | 23 | ||||
| -rw-r--r-- | src/tls/tls_magic.h | 16 |
2 files changed, 27 insertions, 12 deletions
diff --git a/src/tls/tls_ciphersuite.cpp b/src/tls/tls_ciphersuite.cpp index b924ad8c7..26b52f749 100644 --- a/src/tls/tls_ciphersuite.cpp +++ b/src/tls/tls_ciphersuite.cpp @@ -195,26 +195,37 @@ Ciphersuite Ciphersuite::lookup_ciphersuite(u16bit suite) case TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384: return Ciphersuite("", "ECDHE_PSK", "SHA-384", "AES-256", 32); + // SRP ciphersuites + + case TLS_SRP_SHA_WITH_AES_128_CBC_SHA: + return Ciphersuite("", "SRP", "SHA-1", "AES-128", 16); + + case TLS_SRP_SHA_WITH_AES_256_CBC_SHA: + return Ciphersuite("", "SRP", "SHA-1", "AES-256", 32); + + case TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA: + return Ciphersuite("", "SRP", "SHA-1", "3DES", 24); + // SRP/RSA ciphersuites - case TLS_SRP_SHA_RSA_WITH_AES_128_SHA: + case TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA: return Ciphersuite("RSA", "SRP", "SHA-1", "AES-128", 16); - case TLS_SRP_SHA_RSA_WITH_AES_256_SHA: + case TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA: return Ciphersuite("RSA", "SRP", "SHA-1", "AES-256", 32); - case TLS_SRP_SHA_RSA_WITH_3DES_EDE_SHA: + case TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA: return Ciphersuite("RSA", "SRP", "SHA-1", "3DES", 24); // SRP/DSA ciphersuites - case TLS_SRP_SHA_DSS_WITH_AES_128_SHA: + case TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA: return Ciphersuite("DSA", "SRP", "SHA-1", "AES-128", 16); - case TLS_SRP_SHA_DSS_WITH_AES_256_SHA: + case TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA: return Ciphersuite("DSA", "SRP", "SHA-1", "AES-256", 32); - case TLS_SRP_SHA_DSS_WITH_3DES_EDE_SHA: + case TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA: return Ciphersuite("DSA", "SRP", "SHA-1", "3DES", 24); // Signaling ciphersuite values diff --git a/src/tls/tls_magic.h b/src/tls/tls_magic.h index 946b13a04..dced09964 100644 --- a/src/tls/tls_magic.h +++ b/src/tls/tls_magic.h @@ -117,13 +117,17 @@ enum Ciphersuite_Code { TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256 = 0xC037, TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384 = 0xC038, - TLS_SRP_SHA_DSS_WITH_3DES_EDE_SHA = 0xC01C, - TLS_SRP_SHA_DSS_WITH_AES_128_SHA = 0xC01F, - TLS_SRP_SHA_DSS_WITH_AES_256_SHA = 0xC022, + TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA = 0xC01A, + TLS_SRP_SHA_WITH_AES_128_CBC_SHA = 0xC01D, + TLS_SRP_SHA_WITH_AES_256_CBC_SHA = 0xC020, - TLS_SRP_SHA_RSA_WITH_3DES_EDE_SHA = 0xC01B, - TLS_SRP_SHA_RSA_WITH_AES_128_SHA = 0xC01E, - TLS_SRP_SHA_RSA_WITH_AES_256_SHA = 0xC021, + TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA = 0xC01C, + TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA = 0xC01F, + TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA = 0xC022, + + TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA = 0xC01B, + TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA = 0xC01E, + TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA = 0xC021, /* signalling values that cannot be negotiated */ TLS_EMPTY_RENEGOTIATION_INFO_SCSV = 0x00FF |