diff options
| author | lloyd <[email protected]> | 2012-01-27 21:00:21 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-01-27 21:00:21 +0000 |
| commit | b0180988f9282099ae1f3e0118adcd657c18b982 (patch) | |
| tree | da7bc167e70624d325f1805b9a3bbdedfc858cdb /src/tls/tls_ciphersuite.cpp | |
| parent | 1bb039c61c9b372e5780a1bceaf673b0be459f17 (diff) | |
Change naming convention to match RFCs
Diffstat (limited to 'src/tls/tls_ciphersuite.cpp')
| -rw-r--r-- | src/tls/tls_ciphersuite.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/tls/tls_ciphersuite.cpp b/src/tls/tls_ciphersuite.cpp index 6eeb6931d..15a8d5e12 100644 --- a/src/tls/tls_ciphersuite.cpp +++ b/src/tls/tls_ciphersuite.cpp @@ -149,36 +149,36 @@ Ciphersuite Ciphersuite::lookup_ciphersuite(u16bit suite) // PSK+DH ciphersuites case TLS_DHE_PSK_WITH_RC4_128_SHA: - return Ciphersuite("", "PSK_DHE", "SHA-1", "ARC4", 16); + return Ciphersuite("", "DHE_PSK", "SHA-1", "ARC4", 16); case TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA: - return Ciphersuite("", "PSK_DHE", "SHA-1", "3DES", 24); + return Ciphersuite("", "DHE_PSK", "SHA-1", "3DES", 24); case TLS_DHE_PSK_WITH_AES_128_CBC_SHA: - return Ciphersuite("", "PSK_DHE", "SHA-1", "AES-128", 16); + return Ciphersuite("", "DHE_PSK", "SHA-1", "AES-128", 16); case TLS_DHE_PSK_WITH_AES_128_CBC_SHA256: - return Ciphersuite("", "PSK_DHE", "SHA-256", "AES-128", 16); + return Ciphersuite("", "DHE_PSK", "SHA-256", "AES-128", 16); case TLS_DHE_PSK_WITH_AES_256_CBC_SHA: - return Ciphersuite("", "PSK_DHE", "SHA-1", "AES-256", 32); + return Ciphersuite("", "DHE_PSK", "SHA-1", "AES-256", 32); // PSK+ECDH ciphersuites case TLS_ECDHE_PSK_WITH_RC4_128_SHA: - return Ciphersuite("", "PSK_ECDHE", "SHA-1", "ARC4", 16); + return Ciphersuite("", "ECDHE_PSK", "SHA-1", "ARC4", 16); case TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA: - return Ciphersuite("", "PSK_ECDHE", "SHA-1", "3DES", 24); + return Ciphersuite("", "ECDHE_PSK", "SHA-1", "3DES", 24); case TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA: - return Ciphersuite("", "PSK_ECDHE", "SHA-1", "AES-128", 16); + return Ciphersuite("", "ECDHE_PSK", "SHA-1", "AES-128", 16); case TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256: - return Ciphersuite("", "PSK_ECDHE", "SHA-256", "AES-128", 16); + return Ciphersuite("", "ECDHE_PSK", "SHA-256", "AES-128", 16); case TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA: - return Ciphersuite("", "PSK_ECDHE", "SHA-1", "AES-256", 32); + return Ciphersuite("", "ECDHE_PSK", "SHA-1", "AES-256", 32); // SRP/RSA ciphersuites @@ -228,10 +228,6 @@ std::string Ciphersuite::to_string() const out << "ECDHE"; else if(kex_algo() == "SRP") out << "SRP_SHA"; - else if(kex_algo() == "PSK_DHE") - out << "DHE_PSK"; - else if(kex_algo() == "PSK_ECDHE") - out << "ECDHE_PSK"; else out << kex_algo(); |