Add codes for SHA-1 based ECC suites (RFC 4492).

2 files changed, 81 insertions, 25 deletions

diff --git a/src/ssl/tls_magic.h b/src/ssl/tls_magic.h
index c167cc689..6b4dbb97d 100644
--- a/src/ssl/tls_magic.h
+++ b/src/ssl/tls_magic.h
@@ -97,34 +97,42 @@ enum Certificate_Type {
 };
 
 enum Ciphersuite_Code {
-   TLS_RSA_WITH_RC4_128_MD5              = 0x0004,
-   TLS_RSA_WITH_RC4_128_SHA              = 0x0005,
-
-   TLS_RSA_WITH_3DES_EDE_CBC_SHA         = 0x000A,
-
-   TLS_RSA_WITH_AES_128_CBC_SHA          = 0x002F,
-   TLS_RSA_WITH_AES_256_CBC_SHA          = 0x0035,
-   TLS_RSA_WITH_AES_128_CBC_SHA256       = 0x003C,
-   TLS_RSA_WITH_AES_256_CBC_SHA256       = 0x003D,
-   TLS_RSA_WITH_SEED_CBC_SHA             = 0x0096,
-
-   TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA     = 0x0013,
-   TLS_DHE_DSS_WITH_AES_128_CBC_SHA      = 0x0032,
-   TLS_DHE_DSS_WITH_AES_256_CBC_SHA      = 0x0038,
-   TLS_DHE_DSS_WITH_AES_128_CBC_SHA256   = 0x0040,
-   TLS_DHE_DSS_WITH_AES_256_CBC_SHA256   = 0x006A,
-   TLS_DHE_DSS_WITH_SEED_CBC_SHA         = 0x0099,
-
-   TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA     = 0x0016,
-   TLS_DHE_RSA_WITH_AES_128_CBC_SHA      = 0x0033,
-   TLS_DHE_RSA_WITH_AES_256_CBC_SHA      = 0x0039,
-   TLS_DHE_RSA_WITH_AES_128_CBC_SHA256   = 0x0067,
-   TLS_DHE_RSA_WITH_AES_256_CBC_SHA256   = 0x006B,
-   TLS_DHE_RSA_WITH_SEED_CBC_SHA         = 0x009A,
-
+   TLS_RSA_WITH_RC4_128_MD5                 = 0x0004,
+   TLS_RSA_WITH_RC4_128_SHA                 = 0x0005,
+
+   TLS_RSA_WITH_3DES_EDE_CBC_SHA            = 0x000A,
+
+   TLS_RSA_WITH_AES_128_CBC_SHA             = 0x002F,
+   TLS_RSA_WITH_AES_256_CBC_SHA             = 0x0035,
+   TLS_RSA_WITH_AES_128_CBC_SHA256          = 0x003C,
+   TLS_RSA_WITH_AES_256_CBC_SHA256          = 0x003D,
+   TLS_RSA_WITH_SEED_CBC_SHA                = 0x0096,
+
+   TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA        = 0x0013,
+   TLS_DHE_DSS_WITH_AES_128_CBC_SHA         = 0x0032,
+   TLS_DHE_DSS_WITH_AES_256_CBC_SHA         = 0x0038,
+   TLS_DHE_DSS_WITH_AES_128_CBC_SHA256      = 0x0040,
+   TLS_DHE_DSS_WITH_AES_256_CBC_SHA256      = 0x006A,
+   TLS_DHE_DSS_WITH_SEED_CBC_SHA            = 0x0099,
+
+   TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA        = 0x0016,
+   TLS_DHE_RSA_WITH_AES_128_CBC_SHA         = 0x0033,
+   TLS_DHE_RSA_WITH_AES_256_CBC_SHA         = 0x0039,
+   TLS_DHE_RSA_WITH_AES_128_CBC_SHA256      = 0x0067,
+   TLS_DHE_RSA_WITH_AES_256_CBC_SHA256      = 0x006B,
+   TLS_DHE_RSA_WITH_SEED_CBC_SHA            = 0x009A,
+
+   TLS_ECDHE_ECDSA_WITH_RC4_128_SHA         = 0xC007,
+   TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA    = 0xC008,
+   TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA     = 0xC009,
+   TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA     = 0xC00A,
    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256  = 0xC023,
    TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384  = 0xC024,
 
+   TLS_ECDHE_RSA_WITH_RC4_128_SHA           = 0xC011,
+   TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA      = 0xC012,
+   TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA       = 0xC013,
+   TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA       = 0xC014,
    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256    = 0xC027,
    TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384    = 0xC028
 };
diff --git a/src/ssl/tls_suites.cpp b/src/ssl/tls_suites.cpp
index 3f0e76654..f48994b3c 100644
--- a/src/ssl/tls_suites.cpp
+++ b/src/ssl/tls_suites.cpp
@@ -137,6 +137,30 @@ TLS_Ciphersuite_Algos lookup_ciphersuite(u16bit suite)
                                    TLS_ALGO_MAC_SHA256 |
                                    TLS_ALGO_CIPHER_AES256_CBC);
 
+   if(suite == TLS_ECDHE_ECDSA_WITH_RC4_128_SHA)
+      return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_ECDSA |
+                                   TLS_ALGO_KEYEXCH_ECDH |
+                                   TLS_ALGO_MAC_SHA1 |
+                                   TLS_ALGO_CIPHER_RC4_128);
+
+   if(suite == TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA)
+      return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_ECDSA |
+                                   TLS_ALGO_KEYEXCH_ECDH |
+                                   TLS_ALGO_MAC_SHA1 |
+                                   TLS_ALGO_CIPHER_3DES_CBC);
+
+   if(suite == TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA)
+      return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_ECDSA |
+                                   TLS_ALGO_KEYEXCH_ECDH |
+                                   TLS_ALGO_MAC_SHA1 |
+                                   TLS_ALGO_CIPHER_AES128_CBC);
+
+   if(suite == TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA)
+      return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_ECDSA |
+                                   TLS_ALGO_KEYEXCH_ECDH |
+                                   TLS_ALGO_MAC_SHA1 |
+                                   TLS_ALGO_CIPHER_AES256_CBC);
+
    if(suite == TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256)
       return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_ECDSA |
                                    TLS_ALGO_KEYEXCH_ECDH |
@@ -149,6 +173,30 @@ TLS_Ciphersuite_Algos lookup_ciphersuite(u16bit suite)
                                    TLS_ALGO_MAC_SHA384 |
                                    TLS_ALGO_CIPHER_AES256_CBC);
 
+   if(suite == TLS_ECDHE_RSA_WITH_RC4_128_SHA)
+      return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_RSA |
+                                   TLS_ALGO_KEYEXCH_ECDH |
+                                   TLS_ALGO_MAC_SHA1 |
+                                   TLS_ALGO_CIPHER_RC4_128);
+
+   if(suite == TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA)
+      return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_RSA |
+                                   TLS_ALGO_KEYEXCH_ECDH |
+                                   TLS_ALGO_MAC_SHA1 |
+                                   TLS_ALGO_CIPHER_3DES_CBC);
+
+   if(suite == TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA)
+      return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_RSA |
+                                   TLS_ALGO_KEYEXCH_ECDH |
+                                   TLS_ALGO_MAC_SHA1 |
+                                   TLS_ALGO_CIPHER_AES128_CBC);
+
+   if(suite == TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA)
+      return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_RSA |
+                                   TLS_ALGO_KEYEXCH_ECDH |
+                                   TLS_ALGO_MAC_SHA1 |
+                                   TLS_ALGO_CIPHER_AES256_CBC);
+
    if(suite == TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256)
       return TLS_Ciphersuite_Algos(TLS_ALGO_SIGNER_ECDSA |
                                    TLS_ALGO_KEYEXCH_ECDH |