diff options
| author | Jon Spillett <jon.spillett@oracle.com> | 2017-08-22 01:56:13 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-08-30 12:33:53 +0200 |
| commit | bc32673869842c7f00ae7016040a612f516ead7e (patch) | |
| tree | ad88525fc75299889456ce83876ea76fd819c3ef /ssl/ssl_init.c | |
| parent | Fix potential null pointer dereference in ARIA implementation (diff) | |
| download | openssl-bc32673869842c7f00ae7016040a612f516ead7e.tar.xz openssl-bc32673869842c7f00ae7016040a612f516ead7e.zip | |
Implement Aria GCM/CCM Modes and TLS cipher suites
AEAD cipher mode implementation is based on that used for AES:
https://tools.ietf.org/html/rfc5116
TLS GCM cipher suites as specified in:
https://tools.ietf.org/html/rfc6209
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4287)
Diffstat (limited to 'ssl/ssl_init.c')
| -rw-r--r-- | ssl/ssl_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index 478a48e9d6..8eb6ef1c84 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -59,6 +59,10 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_ssl_base) EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1()); EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256()); EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256()); +#ifndef OPENSSL_NO_ARIA + EVP_add_cipher(EVP_aria_128_gcm()); + EVP_add_cipher(EVP_aria_256_gcm()); +#endif #ifndef OPENSSL_NO_CAMELLIA EVP_add_cipher(EVP_camellia_128_cbc()); EVP_add_cipher(EVP_camellia_256_cbc()); |