Commit b4a3aeeb authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-cmac 



There were a couple of CMAC references without OPENSSL_NO_CMAC guards.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent ef33d131

crypto/asn1/ameth_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -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

crypto/evp/pmeth_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -86,7 +86,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

test/evp_test.c

+8 −3
Original line number Diff line number Diff line
@@ -1022,11 +1022,16 @@ static int mac_test_init(struct evp_test *t, const char *alg) 
{

    int type;

    struct mac_data *mdat;

    if (strcmp(alg, "HMAC") == 0)

    if (strcmp(alg, "HMAC") == 0) {

        type = EVP_PKEY_HMAC;

    else if (strcmp(alg, "CMAC") == 0)

    } else if (strcmp(alg, "CMAC") == 0) {

#ifndef OPENSSL_NO_CMAC

        type = EVP_PKEY_CMAC;

    else

#else

        t->skip = 1;

        return 1;

#endif

    } else

        return 0;



    mdat = OPENSSL_malloc(sizeof(*mdat));