TLS_Ciphersuite_Algos was just a strange level of indirection between

the ciphersuite code and a set of strings specifying the underlying
suite algorithms. Remove it entirely.

Some things are likely broken. One I know about is that we always send
the hash/signature type indicator but should only do so for TLS >= 1.2

1 files changed, 4 insertions, 10 deletions

diff --git a/src/tls/c_hello.cpp b/src/tls/c_hello.cpp
index e35c9027a..99011822e 100644
--- a/src/tls/c_hello.cpp
+++ b/src/tls/c_hello.cpp
@@ -290,21 +290,15 @@ void Client_Hello::deserialize(const MemoryRegion<byte>& buf)
          we can safely say it supports everything here and know that
          we'll filter it out later.
          */
-         m_supported_algos.push_back(std::make_pair(TLS_ALGO_HASH_SHA1,
-                                                    TLS_ALGO_SIGNER_RSA));
-
-         m_supported_algos.push_back(std::make_pair(TLS_ALGO_HASH_SHA1,
-                                                    TLS_ALGO_SIGNER_DSA));
+         m_supported_algos.push_back(std::make_pair("SHA-1", "RSA"));
+         m_supported_algos.push_back(std::make_pair("SHA-1", "DSA"));
          }
       else
          {
          // For versions before TLS 1.2, insert fake values for the old defaults
 
-         m_supported_algos.push_back(std::make_pair(TLS_ALGO_HASH_SHA1,
-                                                    TLS_ALGO_SIGNER_RSA));
-
-         m_supported_algos.push_back(std::make_pair(TLS_ALGO_HASH_SHA1,
-                                                    TLS_ALGO_SIGNER_DSA));
+         m_supported_algos.push_back(std::make_pair("TLS.Digest.0", "RSA"));
+         m_supported_algos.push_back(std::make_pair("SHA-1", "DSA"));
          }
 
       }