Clean up ciphersuite handling

1 files changed, 7 insertions, 9 deletions

diff --git a/src/ssl/tls_suites.h b/src/ssl/tls_suites.h
index b7008e8db..837d76422 100644
--- a/src/ssl/tls_suites.h
+++ b/src/ssl/tls_suites.h
@@ -1,6 +1,6 @@
 /**
-* Cipher Suites 
-* (C) 2004-2006 Jack Lloyd
+* Cipher Suites
+* (C) 2004-2010 Jack Lloyd
 *
 * Released under the terms of the Botan license
 */
@@ -9,6 +9,7 @@
 #define BOTAN_TLS_CIPHERSUITES_H__
 
 #include <botan/types.h>
+#include <botan/tls_magic.h>
 #include <string>
 
 namespace Botan {
@@ -19,20 +20,17 @@ namespace Botan {
 class BOTAN_DLL CipherSuite
    {
    public:
-      enum Kex_Type { NO_KEX, RSA_KEX, DH_KEX };
-      enum Sig_Type { NO_SIG, RSA_SIG, DSA_SIG };
-
       std::string cipher_algo() const { return cipher; }
       std::string mac_algo() const { return mac; }
 
       u32bit cipher_keylen() const { return cipher_key_length; }
-      Kex_Type kex_type() const { return kex_algo; }
-      Sig_Type sig_type() const { return sig_algo; }
+
+      TLS_Ciphersuite_Algos kex_type() const { return kex_algo; }
+      TLS_Ciphersuite_Algos sig_type() const { return sig_algo; }
 
       CipherSuite(u16bit = 0);
    private:
-      Kex_Type kex_algo;
-      Sig_Type sig_algo;
+      TLS_Ciphersuite_Algos kex_algo, sig_algo;
       std::string cipher, mac;
       u32bit cipher_key_length;
    };