diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-08-22 03:42:54 +0200 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-08-22 03:42:54 +0200 |
| commit | e1178600cc5d40b1e21c4a01d224afd2d8c7498a (patch) | |
| tree | 9601f94492fbab46a72f96e0982025d7ec7ed236 /providers/default/defltprov.c | |
| parent | Fix drbg_ossl_ctx_free() and drbg_nonce_ossl_ctx_free() to handle NULL (diff) | |
| download | openssl-e1178600cc5d40b1e21c4a01d224afd2d8c7498a.tar.xz openssl-e1178600cc5d40b1e21c4a01d224afd2d8c7498a.zip | |
Add basic aria and camellia ciphers modes to default provider
The aes code has been refactored into generic and algorithn specific parts,
so that most of the code can be shared.
The cipher related files have been broken up into smaller parts.
Add chunked variant of mode ciphers - aria uses this (many other ciphers will use this new code instead of the
generic code used by aes).
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9451)
Diffstat (limited to 'providers/default/defltprov.c')
| -rw-r--r-- | providers/default/defltprov.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/providers/default/defltprov.c b/providers/default/defltprov.c index a20e7ddb9b..5664fbe3b2 100644 --- a/providers/default/defltprov.c +++ b/providers/default/defltprov.c @@ -128,7 +128,51 @@ static const OSSL_ALGORITHM deflt_ciphers[] = { { "ARIA-256-CCM", "default=yes", aria256ccm_functions }, { "ARIA-192-CCM", "default=yes", aria192ccm_functions }, { "ARIA-128-CCM", "default=yes", aria128ccm_functions }, + { "ARIA-256-ECB", "default=yes", aria256ecb_functions }, + { "ARIA-192-ECB", "default=yes", aria192ecb_functions }, + { "ARIA-128-ECB", "default=yes", aria128ecb_functions }, + { "ARIA-256-CBC", "default=yes", aria256cbc_functions }, + { "ARIA-192-CBC", "default=yes", aria192cbc_functions }, + { "ARIA-128-CBC", "default=yes", aria128cbc_functions }, + { "ARIA-256-OFB", "default=yes", aria256ofb_functions }, + { "ARIA-192-OFB", "default=yes", aria192ofb_functions }, + { "ARIA-128-OFB", "default=yes", aria128ofb_functions }, + { "ARIA-256-CFB", "default=yes", aria256cfb_functions }, + { "ARIA-192-CFB", "default=yes", aria192cfb_functions }, + { "ARIA-128-CFB", "default=yes", aria128cfb_functions }, + { "ARIA-256-CFB1", "default=yes", aria256cfb1_functions }, + { "ARIA-192-CFB1", "default=yes", aria192cfb1_functions }, + { "ARIA-128-CFB1", "default=yes", aria128cfb1_functions }, + { "ARIA-256-CFB8", "default=yes", aria256cfb8_functions }, + { "ARIA-192-CFB8", "default=yes", aria192cfb8_functions }, + { "ARIA-128-CFB8", "default=yes", aria128cfb8_functions }, + { "ARIA-256-CTR", "default=yes", aria256ctr_functions }, + { "ARIA-192-CTR", "default=yes", aria192ctr_functions }, + { "ARIA-128-CTR", "default=yes", aria128ctr_functions }, #endif /* OPENSSL_NO_ARIA */ +#ifndef OPENSSL_NO_CAMELLIA + { "CAMELLIA-256-ECB", "default=yes", camellia256ecb_functions }, + { "CAMELLIA-192-ECB", "default=yes", camellia192ecb_functions }, + { "CAMELLIA-128-ECB", "default=yes", camellia128ecb_functions }, + { "CAMELLIA-256-CBC", "default=yes", camellia256cbc_functions }, + { "CAMELLIA-192-CBC", "default=yes", camellia192cbc_functions }, + { "CAMELLIA-128-CBC", "default=yes", camellia128cbc_functions }, + { "CAMELLIA-256-OFB", "default=yes", camellia256ofb_functions }, + { "CAMELLIA-192-OFB", "default=yes", camellia192ofb_functions }, + { "CAMELLIA-128-OFB", "default=yes", camellia128ofb_functions }, + { "CAMELLIA-256-CFB", "default=yes", camellia256cfb_functions }, + { "CAMELLIA-192-CFB", "default=yes", camellia192cfb_functions }, + { "CAMELLIA-128-CFB", "default=yes", camellia128cfb_functions }, + { "CAMELLIA-256-CFB1", "default=yes", camellia256cfb1_functions }, + { "CAMELLIA-192-CFB1", "default=yes", camellia192cfb1_functions }, + { "CAMELLIA-128-CFB1", "default=yes", camellia128cfb1_functions }, + { "CAMELLIA-256-CFB8", "default=yes", camellia256cfb8_functions }, + { "CAMELLIA-192-CFB8", "default=yes", camellia192cfb8_functions }, + { "CAMELLIA-128-CFB8", "default=yes", camellia128cfb8_functions }, + { "CAMELLIA-256-CTR", "default=yes", camellia256ctr_functions }, + { "CAMELLIA-192-CTR", "default=yes", camellia192ctr_functions }, + { "CAMELLIA-128-CTR", "default=yes", camellia128ctr_functions }, +#endif /* OPENSSL_NO_CAMELLIA */ { NULL, NULL, NULL } }; |