|
@@ -14,6 +14,26 @@
|
|
|
#else
|
|
|
XCIPHER(0xc02f, TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256)
|
|
|
#endif
|
|
|
+#ifdef TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
|
|
|
+ CIPHER(0xcca9, TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305)
|
|
|
+#else
|
|
|
+ XCIPHER(0xcca9, TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305)
|
|
|
+#endif
|
|
|
+#ifdef TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305
|
|
|
+ CIPHER(0xcca8, TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305)
|
|
|
+#else
|
|
|
+ XCIPHER(0xcca8, TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305)
|
|
|
+#endif
|
|
|
+#ifdef TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
|
|
|
+ CIPHER(0xc02c, TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384)
|
|
|
+#else
|
|
|
+ XCIPHER(0xc02c, TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384)
|
|
|
+#endif
|
|
|
+#ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384
|
|
|
+ CIPHER(0xc030, TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384)
|
|
|
+#else
|
|
|
+ XCIPHER(0xc030, TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384)
|
|
|
+#endif
|
|
|
#ifdef TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
|
|
|
CIPHER(0xc00a, TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA)
|
|
|
#else
|
|
@@ -34,88 +54,28 @@
|
|
|
#else
|
|
|
XCIPHER(0xc014, TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA)
|
|
|
#endif
|
|
|
-#ifdef TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA
|
|
|
- CIPHER(0xc012, TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0xc012, TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA)
|
|
|
-#endif
|
|
|
-#ifdef TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA
|
|
|
- CIPHER(0xc007, TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0xc007, TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA)
|
|
|
-#endif
|
|
|
-#ifdef TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA
|
|
|
- CIPHER(0xc011, TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0xc011, TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA)
|
|
|
-#endif
|
|
|
#ifdef TLS1_TXT_DHE_RSA_WITH_AES_128_SHA
|
|
|
CIPHER(0x0033, TLS1_TXT_DHE_RSA_WITH_AES_128_SHA)
|
|
|
#else
|
|
|
XCIPHER(0x0033, TLS1_TXT_DHE_RSA_WITH_AES_128_SHA)
|
|
|
#endif
|
|
|
-#ifdef TLS1_TXT_DHE_DSS_WITH_AES_128_SHA
|
|
|
- CIPHER(0x0032, TLS1_TXT_DHE_DSS_WITH_AES_128_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0x0032, TLS1_TXT_DHE_DSS_WITH_AES_128_SHA)
|
|
|
-#endif
|
|
|
-#ifdef TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
|
|
|
- CIPHER(0x0045, TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0x0045, TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA)
|
|
|
-#endif
|
|
|
#ifdef TLS1_TXT_DHE_RSA_WITH_AES_256_SHA
|
|
|
CIPHER(0x0039, TLS1_TXT_DHE_RSA_WITH_AES_256_SHA)
|
|
|
#else
|
|
|
XCIPHER(0x0039, TLS1_TXT_DHE_RSA_WITH_AES_256_SHA)
|
|
|
#endif
|
|
|
-#ifdef TLS1_TXT_DHE_DSS_WITH_AES_256_SHA
|
|
|
- CIPHER(0x0038, TLS1_TXT_DHE_DSS_WITH_AES_256_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0x0038, TLS1_TXT_DHE_DSS_WITH_AES_256_SHA)
|
|
|
-#endif
|
|
|
-#ifdef TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
|
|
|
- CIPHER(0x0088, TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0x0088, TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA)
|
|
|
-#endif
|
|
|
-#ifdef SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA
|
|
|
- CIPHER(0x0016, SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0x0016, SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA)
|
|
|
-#endif
|
|
|
#ifdef TLS1_TXT_RSA_WITH_AES_128_SHA
|
|
|
CIPHER(0x002f, TLS1_TXT_RSA_WITH_AES_128_SHA)
|
|
|
#else
|
|
|
XCIPHER(0x002f, TLS1_TXT_RSA_WITH_AES_128_SHA)
|
|
|
#endif
|
|
|
-#ifdef TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA
|
|
|
- CIPHER(0x0041, TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0x0041, TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA)
|
|
|
-#endif
|
|
|
#ifdef TLS1_TXT_RSA_WITH_AES_256_SHA
|
|
|
CIPHER(0x0035, TLS1_TXT_RSA_WITH_AES_256_SHA)
|
|
|
#else
|
|
|
XCIPHER(0x0035, TLS1_TXT_RSA_WITH_AES_256_SHA)
|
|
|
#endif
|
|
|
-#ifdef TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA
|
|
|
- CIPHER(0x0084, TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0x0084, TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA)
|
|
|
-#endif
|
|
|
#ifdef SSL3_TXT_RSA_DES_192_CBC3_SHA
|
|
|
CIPHER(0x000a, SSL3_TXT_RSA_DES_192_CBC3_SHA)
|
|
|
#else
|
|
|
XCIPHER(0x000a, SSL3_TXT_RSA_DES_192_CBC3_SHA)
|
|
|
#endif
|
|
|
-#ifdef SSL3_TXT_RSA_RC4_128_SHA
|
|
|
- CIPHER(0x0005, SSL3_TXT_RSA_RC4_128_SHA)
|
|
|
-#else
|
|
|
- XCIPHER(0x0005, SSL3_TXT_RSA_RC4_128_SHA)
|
|
|
-#endif
|
|
|
-#ifdef SSL3_TXT_RSA_RC4_128_MD5
|
|
|
- CIPHER(0x0004, SSL3_TXT_RSA_RC4_128_MD5)
|
|
|
-#else
|
|
|
- XCIPHER(0x0004, SSL3_TXT_RSA_RC4_128_MD5)
|
|
|
-#endif
|