diff options
| author | Todd Short <tshort@akamai.com> | 2015-12-28 09:41:52 -0500 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2016-02-10 20:13:26 +0100 |
| commit | 1c37fd96d89f95202f2e54db8d2834cbf1fd8b88 (patch) | |
| tree | 3e531dbbbf55d69a55c9c3c644aacaceb4c49cb0 /ssl | |
| parent | cc9c56894606fdf324933cd8090d9a54d967bf5b (diff) | |
| download | openssl-1c37fd96d89f95202f2e54db8d2834cbf1fd8b88.zip openssl-1c37fd96d89f95202f2e54db8d2834cbf1fd8b88.tar.gz openssl-1c37fd96d89f95202f2e54db8d2834cbf1fd8b88.tar.bz2 | |
Add CHACHA20 alias for ciphers.
Update ciphers documentation as well (based on -04 rev of ID).
Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
RT: #4206, GH: #642
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_ciph.c | 4 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index ecefc79..8843c41 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}, diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index b505309..f10570b 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -364,6 +364,7 @@ # define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM|SSL_AES128CCM|SSL_AES256CCM|SSL_AES128CCM8|SSL_AES256CCM8) # define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256) +# define SSL_CHACHA20 (SSL_CHACHA20POLY1305) /* Bits for algorithm_mac (symmetric authentication) */ |