From: Pauli <paul.dale@oracle.com>
Date: Wed, 30 Aug 2017 22:40:11 +0000 (+1000)
Subject: Add ARIA as an alias for all ARIA based modes.
X-Git-Tag: OpenSSL_1_1_1-pre1~733
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea78d1ec2c65557cf5679b37ab4a1aa661a6d713;p=openssl

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)
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index cba9e14c26..c04dd04976 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},