From 1c37fd96d89f95202f2e54db8d2834cbf1fd8b88 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 28 Dec 2015 09:41:52 -0500 Subject: Add CHACHA20 alias for ciphers. Update ciphers documentation as well (based on -04 rev of ID). Signed-off-by: Kurt Roeckx Reviewed-by: Rich Salz RT: #4206, GH: #642 --- ssl/ssl_ciph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ssl/ssl_ciph.c') diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index ecefc79b27..8843c41f28 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -375,8 +375,8 @@ static const SSL_CIPHER cipher_aliases[] = { 0, 0}, {0, SSL_TXT_CAMELLIA128, 0, 0, 0, SSL_CAMELLIA128, 0, 0, 0, 0, 0, 0}, {0, SSL_TXT_CAMELLIA256, 0, 0, 0, SSL_CAMELLIA256, 0, 0, 0, 0, 0, 0}, - {0, SSL_TXT_CAMELLIA, 0, 0, 0, SSL_CAMELLIA128 | SSL_CAMELLIA256, 0, 0, 0, - 0, 0, 0}, + {0, SSL_TXT_CAMELLIA, 0, 0, 0, SSL_CAMELLIA, 0, 0, 0, 0, 0, 0}, + {0, SSL_TXT_CHACHA20, 0, 0, 0, SSL_CHACHA20, 0, 0, 0, 0, 0, 0 }, /* MAC aliases */ {0, SSL_TXT_MD5, 0, 0, 0, 0, SSL_MD5, 0, 0, 0, 0, 0}, -- cgit v1.2.3