diff options
| author | Jack Lloyd <[email protected]> | 2016-11-25 12:44:35 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-11-25 12:45:10 -0500 |
| commit | 464fb14e69a5aeaea989f89043894e30705d652a (patch) | |
| tree | 1c4e9dd66f755775133b413918945d4e34918a53 | |
| parent | 3e0b4444a0723cf0bd1e1ba591292e112287ecfc (diff) | |
Simplify TLS::Ciphersuite::cbc_ciphersuite
With RC4 removed, anything that is not AEAD is CBC
| -rw-r--r-- | src/lib/tls/tls_ciphersuite.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/tls/tls_ciphersuite.cpp b/src/lib/tls/tls_ciphersuite.cpp index 3c29c3c2b..a15f936be 100644 --- a/src/lib/tls/tls_ciphersuite.cpp +++ b/src/lib/tls/tls_ciphersuite.cpp @@ -37,9 +37,7 @@ bool Ciphersuite::ecc_ciphersuite() const bool Ciphersuite::cbc_ciphersuite() const { - return (cipher_algo() == "3DES" || cipher_algo() == "SEED" || - cipher_algo() == "AES-128" || cipher_algo() == "AES-256" || - cipher_algo() == "Camellia-128" || cipher_algo() == "Camellia-256"); + return (mac_algo() != "AEAD"); } Ciphersuite Ciphersuite::by_id(u16bit suite) |