projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
50966bf
)
Add ARIA as an alias for all ARIA based modes.
author
Pauli
<paul.dale@oracle.com>
Wed, 30 Aug 2017 22:40:11 +0000
(08:40 +1000)
committer
Pauli
<paul.dale@oracle.com>
Wed, 30 Aug 2017 22:40:11 +0000
(08:40 +1000)
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4300)
ssl/ssl_ciph.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index cba9e14c26d6c9bad6133266e784b0ad2251efad..c04dd0497604faffc4c44ccaa2b9710f02eefb1c 100644
(file)
--- 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},