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/t1_trce.c | |
| parent | bd3385d84505eeb552a6125415607785f63c6d2d (diff) | |
Wire ChaCha20-Poly1305 to TLS.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/t1_trce.c')
| -rw-r--r-- | ssl/t1_trce.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index 3a4f039a8c..6f5bed757d 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -461,6 +461,13 @@ static ssl_trace_tbl ssl_ciphers_tbl[] = { {0xC0AD, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM"}, {0xC0AE, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"}, {0xC0AF, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"}, + {0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305" }, + {0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305" }, + {0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305" }, + {0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305" }, + {0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305" }, + {0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305" }, + {0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305" }, {0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"}, {0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"}, }; |