diff options
| author | Matt Braithwaite <mab@google.com> | 2016-05-25 22:06:05 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-05-26 22:42:35 +0300 |
| commit | 053931e74e42bebd129d9b35d9aceb986e873a8f (patch) | |
| tree | a4249c2156ca3f9da61b49c2dc9f99c0cf026173 /include/openssl/tls1.h | |
| parent | d09175ffe335d9be6846b4ac5e9e622d96213a00 (diff) | |
CECPQ1: change from named curve to ciphersuite.
This is easier to deploy, and more obvious. This commit reverts a few
pieces of e25775bc, but keeps most of it.
Change-Id: If8d657a4221c665349c06041bb12fffca1527a2c
Reviewed-on: https://boringssl-review.googlesource.com/8061
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'include/openssl/tls1.h')
| -rw-r--r-- | include/openssl/tls1.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index df173758..6ed9fa93 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -441,6 +441,12 @@ extern "C" { #define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 \ TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 +/* CECPQ1 ciphersuites. These are specific to BoringSSL and not standard. */ +#define TLS1_CK_CECPQ1_RSA_WITH_CHACHA20_POLY1305_SHA256 0x030016B7 +#define TLS1_CK_CECPQ1_ECDSA_WITH_CHACHA20_POLY1305_SHA256 0x030016B8 +#define TLS1_CK_CECPQ1_RSA_WITH_AES_256_GCM_SHA384 0x030016B9 +#define TLS1_CK_CECPQ1_ECDSA_WITH_AES_256_GCM_SHA384 0x030016BA + /* XXX * Inconsistency alert: * The OpenSSL names of ciphers with ephemeral DH here include the string @@ -621,6 +627,17 @@ extern "C" { #define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 \ TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 +/* CECPQ1 ciphersuites. These are specific to BoringSSL and not standard. */ +#define TLS1_TXT_CECPQ1_RSA_WITH_CHACHA20_POLY1305_SHA256 \ + "CECPQ1-RSA-CHACHA20-POLY1305-SHA256" +#define TLS1_TXT_CECPQ1_ECDSA_WITH_CHACHA20_POLY1305_SHA256 \ + "CECPQ1-ECDSA-CHACHA20-POLY1305-SHA256" +#define TLS1_TXT_CECPQ1_RSA_WITH_AES_256_GCM_SHA384 \ + "CECPQ1-RSA-AES256-GCM-SHA384" +#define TLS1_TXT_CECPQ1_ECDSA_WITH_AES_256_GCM_SHA384 \ + "CECPQ1-ECDSA-AES256-GCM-SHA384" + + #define TLS_CT_RSA_SIGN 1 #define TLS_CT_DSS_SIGN 2 #define TLS_CT_RSA_FIXED_DH 3 |