diff options
| author | Matt Caswell <matt@openssl.org> | 2020-08-11 16:17:00 +0100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-08-29 17:40:11 +1000 |
| commit | a540ef90f55c1e10feb709d09332dfa352d9f33e (patch) | |
| tree | 83e75d2fae109f51af8c0583e94f4252e9198412 /providers/fips | |
| parent | 4db71d0175ed42586bcd4e6527caacbd18602adf (diff) | |
| download | openssl-new-a540ef90f55c1e10feb709d09332dfa352d9f33e.tar.gz | |
Extend the provider MAC bridge for CMAC
The previous commits added support for HMAC, SIPHASH and Poly1305 into
the provider MAC bridge. We now extend that for CMAC too.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12637)
Diffstat (limited to 'providers/fips')
| -rw-r--r-- | providers/fips/fipsprov.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 745d5320ba..0ab24434ba 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -437,6 +437,9 @@ static const OSSL_ALGORITHM fips_signature[] = { { "ECDSA", FIPS_DEFAULT_PROPERTIES, ecdsa_signature_functions }, #endif { "HMAC", FIPS_DEFAULT_PROPERTIES, mac_hmac_signature_functions }, +#ifndef OPENSSL_NO_CMAC + { "CMAC", FIPS_DEFAULT_PROPERTIES, mac_cmac_signature_functions }, +#endif { NULL, NULL, NULL } }; @@ -466,6 +469,9 @@ static const OSSL_ALGORITHM fips_keymgmt[] = { { "TLS1-PRF", FIPS_DEFAULT_PROPERTIES, kdf_keymgmt_functions }, { "HKDF", FIPS_DEFAULT_PROPERTIES, kdf_keymgmt_functions }, { "HMAC", FIPS_DEFAULT_PROPERTIES, mac_keymgmt_functions }, +#ifndef OPENSSL_NO_CMAC + { "CMAC", FIPS_DEFAULT_PROPERTIES, cmac_keymgmt_functions }, +#endif { NULL, NULL, NULL } }; |