summaryrefslogtreecommitdiffstats
path: root/providers/defltprov.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-08-11 16:17:00 +0100
committerPauli <paul.dale@oracle.com>2020-08-29 17:40:11 +1000
commita540ef90f55c1e10feb709d09332dfa352d9f33e (patch)
tree83e75d2fae109f51af8c0583e94f4252e9198412 /providers/defltprov.c
parent4db71d0175ed42586bcd4e6527caacbd18602adf (diff)
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/defltprov.c')
-rw-r--r--providers/defltprov.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c
index 34d2fb29f4..ff5768af74 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -369,6 +369,9 @@ static const OSSL_ALGORITHM deflt_signature[] = {
#ifndef OPENSSL_NO_POLY1305
{ "POLY1305", "provider=default", mac_poly1305_signature_functions },
#endif
+#ifndef OPENSSL_NO_CMAC
+ { "CMAC", "provider=default", mac_cmac_signature_functions },
+#endif
{ NULL, NULL, NULL }
};
@@ -402,6 +405,9 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = {
#ifndef OPENSSL_NO_POLY1305
{ "POLY1305", "provider=default", mac_keymgmt_functions },
#endif
+#ifndef OPENSSL_NO_CMAC
+ { "CMAC", "provider=default", cmac_keymgmt_functions },
+#endif
{ NULL, NULL, NULL }
};