diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-08-20 00:54:41 +0200 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-08-20 00:54:41 +0200 |
| commit | 3bfe9005e5ae0b513bf5f449d6cf558f9b4d9e1f (patch) | |
| tree | dbdfca3362d551abc73fc9219fbc456b97664bd7 /providers/default/defltprov.c | |
| parent | Get rid of using deprecated function isascii (diff) | |
| download | openssl-3bfe9005e5ae0b513bf5f449d6cf558f9b4d9e1f.tar.xz openssl-3bfe9005e5ae0b513bf5f449d6cf558f9b4d9e1f.zip | |
Add aes_ccm to provider
Add Cleanups for gcm - based on the changes to ccm.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Patrick Steuer <patrick.steuer@de.ibm.com>
(Merged from https://github.com/openssl/openssl/pull/9280)
Diffstat (limited to 'providers/default/defltprov.c')
| -rw-r--r-- | providers/default/defltprov.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/providers/default/defltprov.c b/providers/default/defltprov.c index 535c05252a..6621e49b9c 100644 --- a/providers/default/defltprov.c +++ b/providers/default/defltprov.c @@ -116,13 +116,20 @@ static const OSSL_ALGORITHM deflt_ciphers[] = { { "AES-256-CTR", "default=yes", aes256ctr_functions }, { "AES-192-CTR", "default=yes", aes192ctr_functions }, { "AES-128-CTR", "default=yes", aes128ctr_functions }, +/* TODO(3.0) Add aliases when they are supported */ { "id-aes256-GCM", "default=yes", aes256gcm_functions }, { "id-aes192-GCM", "default=yes", aes192gcm_functions }, { "id-aes128-GCM", "default=yes", aes128gcm_functions }, + { "id-aes256-CCM", "default=yes", aes256ccm_functions }, + { "id-aes192-CCM", "default=yes", aes192ccm_functions }, + { "id-aes128-CCM", "default=yes", aes128ccm_functions }, #ifndef OPENSSL_NO_ARIA { "ARIA-256-GCM", "default=yes", aria256gcm_functions }, { "ARIA-192-GCM", "default=yes", aria192gcm_functions }, { "ARIA-128-GCM", "default=yes", aria128gcm_functions }, + { "ARIA-256-CCM", "default=yes", aria256ccm_functions }, + { "ARIA-192-CCM", "default=yes", aria192ccm_functions }, + { "ARIA-128-CCM", "default=yes", aria128ccm_functions }, #endif /* OPENSSL_NO_ARIA */ { NULL, NULL, NULL } }; |