Skip to content

Commit bc32673

Browse files
jon-oraclelevitte
authored andcommitted
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 <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (Merged from openssl#4287)
1 parent 1c2ac29 commit bc32673

File tree

20 files changed

+1155
-10
lines changed

20 files changed

+1155
-10
lines changed

CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
Changes between 1.1.0f and 1.1.1 [xx XXX xxxx]
1111

12+
*) Add ARIA AEAD TLS support.
13+
[Jon Spillett]
14+
1215
*) Some macro definitions to support VS6 have been removed. Visual
1316
Studio 6 has not worked since 1.1.0
1417
[Rich Salz]

crypto/err/openssl.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,8 @@ EVP_F_AES_OCB_CIPHER:169:aes_ocb_cipher
634634
EVP_F_AES_T4_INIT_KEY:178:aes_t4_init_key
635635
EVP_F_AES_WRAP_CIPHER:170:aes_wrap_cipher
636636
EVP_F_ALG_MODULE_INIT:177:alg_module_init
637+
EVP_F_ARIA_CCM_INIT_KEY:175:aria_ccm_init_key
638+
EVP_F_ARIA_GCM_INIT_KEY:176:aria_gcm_init_key
637639
EVP_F_ARIA_INIT_KEY:185:aria_init_key
638640
EVP_F_CAMELLIA_INIT_KEY:159:camellia_init_key
639641
EVP_F_CHACHA20_POLY1305_CTRL:182:chacha20_poly1305_ctrl

crypto/evp/build.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ SOURCE[../../libcrypto]=\
1717
INCLUDE[e_aes.o]=.. ../modes
1818
INCLUDE[e_aes_cbc_hmac_sha1.o]=../modes
1919
INCLUDE[e_aes_cbc_hmac_sha256.o]=../modes
20+
INCLUDE[e_aria.o]=.. ../modes
2021
INCLUDE[e_camellia.o]=.. ../modes
2122
INCLUDE[e_des.o]=..
2223
INCLUDE[e_des3.o]=..

crypto/evp/c_allc.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ void openssl_add_all_ciphers_int(void)
189189
EVP_add_cipher(EVP_aria_128_cfb8());
190190
EVP_add_cipher(EVP_aria_128_ctr());
191191
EVP_add_cipher(EVP_aria_128_ofb());
192+
EVP_add_cipher(EVP_aria_128_gcm());
193+
EVP_add_cipher(EVP_aria_128_ccm());
192194
EVP_add_cipher_alias(SN_aria_128_cbc, "ARIA128");
193195
EVP_add_cipher_alias(SN_aria_128_cbc, "aria128");
194196
EVP_add_cipher(EVP_aria_192_ecb());
@@ -198,6 +200,8 @@ void openssl_add_all_ciphers_int(void)
198200
EVP_add_cipher(EVP_aria_192_cfb8());
199201
EVP_add_cipher(EVP_aria_192_ctr());
200202
EVP_add_cipher(EVP_aria_192_ofb());
203+
EVP_add_cipher(EVP_aria_192_gcm());
204+
EVP_add_cipher(EVP_aria_192_ccm());
201205
EVP_add_cipher_alias(SN_aria_192_cbc, "ARIA192");
202206
EVP_add_cipher_alias(SN_aria_192_cbc, "aria192");
203207
EVP_add_cipher(EVP_aria_256_ecb());
@@ -207,6 +211,8 @@ void openssl_add_all_ciphers_int(void)
207211
EVP_add_cipher(EVP_aria_256_cfb8());
208212
EVP_add_cipher(EVP_aria_256_ctr());
209213
EVP_add_cipher(EVP_aria_256_ofb());
214+
EVP_add_cipher(EVP_aria_256_gcm());
215+
EVP_add_cipher(EVP_aria_256_ccm());
210216
EVP_add_cipher_alias(SN_aria_256_cbc, "ARIA256");
211217
EVP_add_cipher_alias(SN_aria_256_cbc, "aria256");
212218
#endif

0 commit comments

Comments
 (0)