aboutsummaryrefslogtreecommitdiff
path: root/ssl/ssl_ciph.c
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-08-31 08:40:11 +1000
committerPauli <paul.dale@oracle.com>2017-08-31 08:40:11 +1000
commitea78d1ec2c65557cf5679b37ab4a1aa661a6d713 (patch)
treeda668c49062b992ec572d7a596edd58353935ffa /ssl/ssl_ciph.c
parent50966bfa119d129c4b2bc405b6ade1c6a21b84f2 (diff)
downloadopenssl-ea78d1ec2c65557cf5679b37ab4a1aa661a6d713.zip
openssl-ea78d1ec2c65557cf5679b37ab4a1aa661a6d713.tar.gz
openssl-ea78d1ec2c65557cf5679b37ab4a1aa661a6d713.tar.bz2
Add ARIA as an alias for all ARIA based modes.
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4300)
Diffstat (limited to 'ssl/ssl_ciph.c')
-rw-r--r--ssl/ssl_ciph.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index cba9e14..c04dd04 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -273,6 +273,7 @@ static const SSL_CIPHER cipher_aliases[] = {
{0, SSL_TXT_CAMELLIA, NULL, 0, 0, 0, SSL_CAMELLIA},
{0, SSL_TXT_CHACHA20, NULL, 0, 0, 0, SSL_CHACHA20},
+ {0, SSL_TXT_ARIA, NULL, 0, 0, 0, SSL_ARIA},
{0, SSL_TXT_ARIA_GCM, NULL, 0, 0, 0, SSL_ARIA128GCM | SSL_ARIA256GCM},
{0, SSL_TXT_ARIA128, NULL, 0, 0, 0, SSL_ARIA128GCM},
{0, SSL_TXT_ARIA256, NULL, 0, 0, 0, SSL_ARIA256GCM},