[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  782a2be2ed5f4781d6c90d56ccf4a608b875f325 (commit)
      from  733f72f182f420282bc248441cbf34a0f3721e7f (commit)


- Log -----------------------------------------------------------------
commit 782a2be2ed5f4781d6c90d56ccf4a608b875f325
Author: Dirk Feytons <dirk.feytons at technicolor.com>
Date:   Thu Jun 2 15:31:57 2016 +0200

    Fix build with no-cmac
    
    Add missing ifdefs. Same change is already present in master, see
    b4a3aeebd9f9280aa7e69a343f5c824e68466d90
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1155)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/ameth_lib.c | 2 ++
 crypto/evp/pmeth_lib.c  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 5389c04..43ddebb 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
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 9f81d10..9668b3a 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -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