Commit eff1a4d2 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

New macro to set mac key. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 6906a7c1

crypto/evp/evp.h

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

crypto/evp/pmeth_gn.c

+1 −3
Original line number Diff line number Diff line
@@ -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;