diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-12-09 21:47:00 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-12-10 12:05:30 +0100 |
| commit | a76ba82ccbfee6df5aa86ba2a275b713f3e0f239 (patch) | |
| tree | 0add0037a482ee7b062f7199dda1a1828cf9a5e2 /ssl/ssl_ciph.c | |
| parent | bd3385d84505eeb552a6125415607785f63c6d2d (diff) | |
| download | openssl-a76ba82ccbfee6df5aa86ba2a275b713f3e0f239.tar.gz | |
Wire ChaCha20-Poly1305 to TLS.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 69a0cc8984..ea6aba04f4 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -169,7 +169,8 @@ #define SSL_ENC_AES128CCM8_IDX 16 #define SSL_ENC_AES256CCM8_IDX 17 #define SSL_ENC_GOST8912_IDX 18 -#define SSL_ENC_NUM_IDX 19 +#define SSL_ENC_CHACHA_IDX 19 +#define SSL_ENC_NUM_IDX 20 /* NB: make sure indices in these tables match values above */ @@ -199,6 +200,7 @@ static const ssl_cipher_table ssl_cipher_table_cipher[SSL_ENC_NUM_IDX] = { {SSL_AES128CCM8, NID_aes_128_ccm}, /* SSL_ENC_AES128CCM8_IDX 16 */ {SSL_AES256CCM8, NID_aes_256_ccm}, /* SSL_ENC_AES256CCM8_IDX 17 */ {SSL_eGOST2814789CNT12, NID_gost89_cnt_12}, /* SSL_ENC_GOST8912_IDX */ + {SSL_CHACHA20POLY1305, NID_chacha20_poly1305}, }; static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = { |