diff options
| author | Pauli <paul.dale@oracle.com> | 2017-02-01 01:10:13 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-02-21 11:51:45 +0100 |
| commit | d42d0a4dc7925e3ea398821028a254c94665d733 (patch) | |
| tree | 4525cbb07e99c47cd4e8576b014111ccd427e398 /ssl/ssl_ciph.c | |
| parent | Added '-nameopt' option to the verify command. (diff) | |
| download | openssl-d42d0a4dc7925e3ea398821028a254c94665d733.tar.xz openssl-d42d0a4dc7925e3ea398821028a254c94665d733.zip | |
Implementation of the ARIA cipher as described in RFC 5794.
This implementation is written in endian agnostic C code. No attempt
at providing machine specific assembly code has been made. This
implementation expands the evptests by including the test cases from
RFC 5794 and ARIA official site rather than providing an individual
test case. Support for ARIA has been integrated into the command line
applications, but not TLS. Implemented modes are CBC, CFB1, CFB8,
CFB128, CTR, ECB and OFB128.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2337)
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 93da3dc19c..2d2395c5c1 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -101,10 +101,7 @@ static const ssl_cipher_table ssl_cipher_table_cipher[SSL_ENC_NUM_IDX] = { {SSL_CHACHA20POLY1305, NID_chacha20_poly1305}, }; -static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = { - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL -}; +static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]; #define SSL_COMP_NULL_IDX 0 #define SSL_COMP_ZLIB_IDX 1 |