From 464fb14e69a5aeaea989f89043894e30705d652a Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Fri, 25 Nov 2016 12:44:35 -0500 Subject: Simplify TLS::Ciphersuite::cbc_ciphersuite With RC4 removed, anything that is not AEAD is CBC --- src/lib/tls/tls_ciphersuite.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/lib/tls') 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) -- cgit v1.2.3