summaryrefslogtreecommitdiffstats
path: root/crypto/asn1/ameth_lib.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-03-18 14:49:25 +0100
committerMatt Caswell <matt@openssl.org>2016-03-18 18:07:11 +0100
commitb4a3aeebd9f9280aa7e69a343f5c824e68466d90 (patch)
tree83d9d751359bcb4429477afc236660b03dc57bfe /crypto/asn1/ameth_lib.c
parentAdd a test to see that signals are caught as failures (diff)
downloadopenssl-b4a3aeebd9f9280aa7e69a343f5c824e68466d90.tar.xz
openssl-b4a3aeebd9f9280aa7e69a343f5c824e68466d90.zip
Fix no-cmac
There were a couple of CMAC references without OPENSSL_NO_CMAC guards. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/asn1/ameth_lib.c')
-rw-r--r--crypto/asn1/ameth_lib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 8458e811c9..0926a4f26c 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -86,7 +86,9 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
&eckey_asn1_meth,
#endif
&hmac_asn1_meth,
+#ifndef OPENSSL_NO_CMAC
&cmac_asn1_meth,
+#endif
#ifndef OPENSSL_NO_DH
&dhx_asn1_meth
#endif