Commit 782a2be2 authored Jun 02, 2016 by Dirk Feytons Committed by Rich Salz Jun 03, 2016

Fix build with no-cmac



Add missing ifdefs. Same change is already present in master, see
b4a3aeeb

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1155)

parent 733f72f1

crypto/asn1/ameth_lib.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -93,7 +93,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

crypto/evp/pmeth_lib.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -91,7 +91,9 @@ static const EVP_PKEY_METHOD *standard_methods[] = {
		&ec_pkey_meth,
		#endif
		&hmac_pkey_meth,
		#ifndef OPENSSL_NO_CMAC
		&cmac_pkey_meth,
		#endif
		#ifndef OPENSSL_NO_DH
		&dhx_pkey_meth
		#endif