Index: openssl/include/openssl/tls1.h |
diff --git a/openssl/include/openssl/tls1.h b/openssl/include/openssl/tls1.h |
index 8fc1ff4565ad4640f721dee7ca671f43be9106fe..0ce0193c582690d7515fb9ab31c0ba3dbccf9dbd 100644 |
--- a/openssl/include/openssl/tls1.h |
+++ b/openssl/include/openssl/tls1.h |
@@ -522,6 +522,10 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) |
#define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256 0x0300C031 |
#define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384 0x0300C032 |
+#define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 0x0300CC13 |
+#define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CC14 |
+#define TLS1_CK_DHE_RSA_CHACHA20_POLY1305 0x0300CC15 |
+ |
/* XXX |
* Inconsistency alert: |
* The OpenSSL names of ciphers with ephemeral DH here include the string |
@@ -673,6 +677,10 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) |
#define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256 "ECDH-RSA-AES128-GCM-SHA256" |
#define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384 "ECDH-RSA-AES256-GCM-SHA384" |
+#define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 "ECDHE-RSA-CHACHA20-POLY1305" |
+#define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 "ECDHE-ECDSA-CHACHA20-POLY1305" |
+#define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305 "DHE-RSA-CHACHA20-POLY1305" |
+ |
#define TLS_CT_RSA_SIGN 1 |
#define TLS_CT_DSS_SIGN 2 |
#define TLS_CT_RSA_FIXED_DH 3 |