Fix AES code.

[openssl.git] / ssl / tls1.h

diff --git a/ssl/tls1.h b/ssl/tls1.h
index 0ee82076121ad4e7aecb9304ef037b4a9ba0055e..ac5410b47269232863ee42504c42bc3e9b41dff5 100644 (file)
--- a/ssl/tls1.h
+++ b/ssl/tls1.h
@@ -95,8 +95,22 @@ extern "C" {
 #define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA         0x03000064
 #define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA     0x03000065
 #define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA               0x03000066
-  /* not yet real */
-#define TLS1_CK_RSA_WITH_RD_128_SHA                    0x03000067
+
+  /* AES ciphersuites from draft ietf-tls-ciphersuite-03.txt */
+
+#define TLS1_CK_RSA_WITH_AES_128_SHA                   0x0300002F
+#define TLS1_CK_DH_DSS_WITH_AES_128_SHA                        0x03000030
+#define TLS1_CK_DH_RSA_WITH_AES_128_SHA                        0x03000031
+#define TLS1_CK_DHE_DSS_WITH_AES_128_SHA               0x03000032
+#define TLS1_CK_DHE_RSA_WITH_AES_128_SHA               0x03000033
+#define TLS1_CK_ADH_WITH_AES_128_SHA                   0x03000034
+
+#define TLS1_CK_RSA_WITH_AES_256_SHA                   0x03000035
+#define TLS1_CK_DH_DSS_WITH_AES_256_SHA                        0x03000036
+#define TLS1_CK_DH_RSA_WITH_AES_256_SHA                        0x03000037
+#define TLS1_CK_DHE_DSS_WITH_AES_256_SHA               0x03000038
+#define TLS1_CK_DHE_RSA_WITH_AES_256_SHA               0x03000039
+#define TLS1_CK_ADH_WITH_AES_256_SHA                   0x0300003A
 
 /* XXX
  * Inconsistency alert:
@@ -112,8 +126,20 @@ extern "C" {
 #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA                "EXP1024-RC4-SHA"
 #define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA    "EXP1024-DHE-DSS-RC4-SHA"
 #define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA              "DHE-DSS-RC4-SHA"
-  /* Not yet real */
-#define TLS1_TXT_RSA_WITH_RD_128_SHA                   "RD128-SHA"
+  /* AES ciphersuites from draft ietf-tls-ciphersuite-03.txt */
+#define TLS1_TXT_RSA_WITH_AES_128_SHA                  "AES128-SHA"
+#define TLS1_TXT_DH_DSS_WITH_AES_128_SHA               "DH-DSS-AES128-SHA"
+#define TLS1_TXT_DH_RSA_WITH_AES_128_SHA               "DH-RSA-AES128-SHA"
+#define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA              "DHE-DSS-AES128-SHA"
+#define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA              "DHE-RSA-AES128-SHA"
+#define TLS1_TXT_ADH_WITH_AES_128_SHA                  "ADH-AES128-SHA"
+
+#define TLS1_TXT_RSA_WITH_AES_256_SHA                  "AES256-SHA"
+#define TLS1_TXT_DH_DSS_WITH_AES_256_SHA               "DH-DSS-AES256-SHA"
+#define TLS1_TXT_DH_RSA_WITH_AES_256_SHA               "DH-RSA-AES256-SHA"
+#define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA              "DHE-DSS-AES256-SHA"
+#define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA              "DHE-RSA-AES256-SHA"
+#define TLS1_TXT_ADH_WITH_AES_256_SHA                  "ADH-AES256-SHA"
 
 
 #define TLS_CT_RSA_SIGN                        1