diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-07-10 03:42:03 +0200 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-20 04:33:02 +0200 |
| commit | ca392b294359a8e9ca55e685b344b485d02bc93b (patch) | |
| tree | 9ef95d8ecdaf77b98811f18d7e5f2be19cc72b83 /providers/fips/fipsprov.c | |
| parent | Fix missing bn_mul_mont symbol in solaris fips module (diff) | |
| download | openssl-ca392b294359a8e9ca55e685b344b485d02bc93b.tar.xz openssl-ca392b294359a8e9ca55e685b344b485d02bc93b.zip | |
Add aes_wrap cipher to providers
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9406)
Diffstat (limited to '')
| -rw-r--r-- | providers/fips/fipsprov.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 67ce90ac13..a15ba4d788 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -285,6 +285,22 @@ const char *ossl_prov_util_nid_to_name(int nid) return "id-aes192-CCM"; case NID_aes_128_ccm: return "id-aes128-CCM"; + case NID_id_aes256_wrap: + return "id-aes256-wrap"; + case NID_id_aes192_wrap: + return "id-aes192-wrap"; + case NID_id_aes128_wrap: + return "id-aes128-wrap"; + case NID_id_aes256_wrap_pad: + return "id-aes256-wrap-pad"; + case NID_id_aes192_wrap_pad: + return "id-aes192-wrap-pad"; + case NID_id_aes128_wrap_pad: + return "id-aes128-wrap-pad"; + case NID_des_ede3_ecb: + return "DES-EDE3"; + case NID_des_ede3_cbc: + return "DES-EDE3-CBC"; default: break; } @@ -306,7 +322,7 @@ static const OSSL_ALGORITHM fips_digests[] = { { "SHA3-512", "fips=yes", sha3_512_functions }, /* * KECCAK_KMAC128 and KECCAK_KMAC256 as hashes are mostly useful for - * the KMAC128 and KMAC256. + * KMAC128 and KMAC256. */ { "KECCAK_KMAC128", "fips=yes", keccak_kmac_128_functions }, { "KECCAK_KMAC256", "fips=yes", keccak_kmac_256_functions }, @@ -333,6 +349,12 @@ static const OSSL_ALGORITHM fips_ciphers[] = { { "id-aes256-CCM", "fips=yes", aes256ccm_functions }, { "id-aes192-CCM", "fips=yes", aes192ccm_functions }, { "id-aes128-CCM", "fips=yes", aes128ccm_functions }, + { "id-aes256-wrap", "fips=yes", aes256wrap_functions }, + { "id-aes192-wrap", "fips=yes", aes192wrap_functions }, + { "id-aes128-wrap", "fips=yes", aes128wrap_functions }, + { "id-aes256-wrap-pad", "fips=yes", aes256wrappad_functions }, + { "id-aes192-wrap-pad", "fips=yes", aes192wrappad_functions }, + { "id-aes128-wrap-pad", "fips=yes", aes128wrappad_functions }, #ifndef OPENSSL_NO_DES { "DES-EDE3", "fips=yes", tdes_ede3_ecb_functions }, { "DES-EDE3-CBC", "fips=yes", tdes_ede3_cbc_functions }, |