From eff1a4d24f3f23b48984b7b60d4c343a3a995f38 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 10 Feb 2015 18:06:56 +0000 Subject: [PATCH 1/1] New macro to set mac key. Reviewed-by: Richard Levitte --- crypto/evp/evp.h | 4 ++++ crypto/evp/pmeth_gn.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 0dbd420103..2e9f83fac7 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -1198,6 +1198,10 @@ void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG, \ EVP_PKEY_CTRL_GET_MD, 0, (void *)pmd) +# define EVP_PKEY_CTX_set_mac_key(ctx, key, len) \ + EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_KEYGEN, \ + EVP_PKEY_CTRL_SET_MAC_KEY, len, (void *)key) + # define EVP_PKEY_CTRL_MD 1 # define EVP_PKEY_CTRL_PEER_KEY 2 diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c index 46057cfac2..45559eb4f7 100644 --- a/crypto/evp/pmeth_gn.c +++ b/crypto/evp/pmeth_gn.c @@ -202,9 +202,7 @@ EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e, return NULL; if (EVP_PKEY_keygen_init(mac_ctx) <= 0) goto merr; - if (EVP_PKEY_CTX_ctrl(mac_ctx, -1, EVP_PKEY_OP_KEYGEN, - EVP_PKEY_CTRL_SET_MAC_KEY, - keylen, (void *)key) <= 0) + if (EVP_PKEY_CTX_set_mac_key(mac_ctx, key, keylen) <= 0) goto merr; if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0) goto merr; -- 2.34.1