Prohibit SHA256/SHA384 ciphersuites in TLS 1.0/1.1 (GH #496)

1 files changed, 10 insertions, 3 deletions

diff --git a/src/lib/tls/tls_policy.cpp b/src/lib/tls/tls_policy.cpp
index ccab54ca0..ae200ff47 100644
--- a/src/lib/tls/tls_policy.cpp
+++ b/src/lib/tls/tls_policy.cpp
@@ -391,9 +391,16 @@ std::vector<uint16_t> Policy::ciphersuite_list(Protocol_Version version,
       if(!have_srp && suite.kex_algo() == "SRP_SHA")
          continue;
 
-      // Are we doing AEAD in a non-AEAD version
-      if(!version.supports_aead_modes() && suite.mac_algo() == "AEAD")
-         continue;
+      if(!version.supports_aead_modes())
+         {
+         // Are we doing AEAD in a non-AEAD version?
+         if(suite.mac_algo() == "AEAD")
+            continue;
+
+         // Older (v1.0/v1.1) versions also do not support any hash but SHA-1
+         if(suite.mac_algo() != "SHA-1")
+            continue;
+         }
 
       if(!value_exists(kex, suite.kex_algo()))
          continue; // unsupported key exchange