diff options
| author | Dirk Feytons <dirk.feytons@technicolor.com> | 2016-06-02 15:31:57 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-03 13:03:29 -0400 |
| commit | 782a2be2ed5f4781d6c90d56ccf4a608b875f325 (patch) | |
| tree | 0c0d2ba102483644e8bf326c6ecb48f71884bc81 /crypto/asn1 | |
| parent | 733f72f182f420282bc248441cbf34a0f3721e7f (diff) | |
Fix build with no-cmac
Add missing ifdefs. Same change is already present in master, see
b4a3aeebd9f9280aa7e69a343f5c824e68466d90
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1155)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/ameth_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 5389c04347..43ddebba33 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -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 |