diff options
| author | Pauli <paul.dale@oracle.com> | 2017-02-01 10:10:13 +1000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-02-21 11:51:45 +0100 |
| commit | d42d0a4dc7925e3ea398821028a254c94665d733 (patch) | |
| tree | 4525cbb07e99c47cd4e8576b014111ccd427e398 /apps/openssl.c | |
| parent | ad39b31c1ce0323d6f6ec44842d955f9f2556adf (diff) | |
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 'apps/openssl.c')
| -rw-r--r-- | apps/openssl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index 6e63df1fc2..bb776eb310 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -571,6 +571,9 @@ static int SortFnByName(const void *_f1, const void *_f2) static void list_disabled(void) { BIO_puts(bio_out, "Disabled algorithms:\n"); +#ifdef OPENSSL_NO_ARIA + BIO_puts(bio_out, "ARIA\n"); +#endif #ifdef OPENSSL_NO_BF BIO_puts(bio_out, "BF\n"); #endif |