Commit be5fc053 authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Replace EVP_MAC_CTX_copy() by EVP_MAC_CTX_dup() 



Reviewed-by: default avatarTomas Mraz <tmraz@fedoraproject.org>
GH: #7651
parent e6071f29

crypto/err/openssl.txt

+2 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ EVP_F_EVP_KDF_CTX_NEW:240:EVP_KDF_CTX_new 
EVP_F_EVP_KDF_CTX_NEW_ID:226:EVP_KDF_CTX_new_id

EVP_F_EVP_MAC_CTRL:209:EVP_MAC_ctrl

EVP_F_EVP_MAC_CTRL_STR:210:EVP_MAC_ctrl_str

EVP_F_EVP_MAC_CTX_COPY:211:EVP_MAC_CTX_copy

EVP_F_EVP_MAC_CTX_DUP:211:EVP_MAC_CTX_dup

EVP_F_EVP_MAC_CTX_NEW:213:EVP_MAC_CTX_new

EVP_F_EVP_MAC_INIT:212:EVP_MAC_init

EVP_F_EVP_MD_BLOCK_SIZE:232:EVP_MD_block_size
@@ -880,6 +880,7 @@ EVP_F_PKCS5_V2_PBE_KEYIVGEN:118:PKCS5_v2_PBE_keyivgen 
EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN:164:PKCS5_v2_PBKDF2_keyivgen

EVP_F_PKCS5_V2_SCRYPT_KEYIVGEN:180:PKCS5_v2_scrypt_keyivgen

EVP_F_PKEY_KDF_CTRL:227:pkey_kdf_ctrl

EVP_F_PKEY_MAC_COPY:241:pkey_mac_copy

EVP_F_PKEY_MAC_INIT:214:pkey_mac_init

EVP_F_PKEY_SET_TYPE:158:pkey_set_type

EVP_F_POLY1305_CTRL:216:poly1305_ctrl

crypto/evp/evp_err.c

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static const ERR_STRING_DATA EVP_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_KDF_CTX_NEW_ID, 0), "EVP_KDF_CTX_new_id"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTRL, 0), "EVP_MAC_ctrl"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTRL_STR, 0), "EVP_MAC_ctrl_str"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTX_COPY, 0), "EVP_MAC_CTX_copy"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTX_DUP, 0), "EVP_MAC_CTX_dup"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTX_NEW, 0), "EVP_MAC_CTX_new"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_INIT, 0), "EVP_MAC_init"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MD_BLOCK_SIZE, 0), "EVP_MD_block_size"},
@@ -179,6 +179,7 @@ static const ERR_STRING_DATA EVP_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EVP, EVP_F_PKCS5_V2_SCRYPT_KEYIVGEN, 0),

     "PKCS5_v2_scrypt_keyivgen"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_PKEY_KDF_CTRL, 0), "pkey_kdf_ctrl"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_PKEY_MAC_COPY, 0), "pkey_mac_copy"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_PKEY_MAC_INIT, 0), "pkey_mac_init"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_PKEY_SET_TYPE, 0), "pkey_set_type"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_POLY1305_CTRL, 0), "poly1305_ctrl"},

crypto/evp/mac_lib.c

+17 −7
Original line number Diff line number Diff line
@@ -48,18 +48,28 @@ void EVP_MAC_CTX_free(EVP_MAC_CTX *ctx) 
    OPENSSL_free(ctx);

}



int EVP_MAC_CTX_copy(EVP_MAC_CTX *dst, const EVP_MAC_CTX *src)

EVP_MAC_CTX *EVP_MAC_CTX_dup(const EVP_MAC_CTX *src)

{

    EVP_MAC_IMPL *macdata;

    EVP_MAC_CTX *dst = EVP_MAC_CTX_new(src->meth);



    if (src->data != NULL && !dst->meth->copy(dst->data, src->data))

        return 0;

    if (dst == NULL)

        return NULL;



    dst = OPENSSL_malloc(sizeof(*dst));

    if (dst == NULL) {

        EVPerr(EVP_F_EVP_MAC_CTX_DUP, ERR_R_MALLOC_FAILURE);

        return NULL;

    }



    macdata = dst->data;

    *dst = *src;

    dst->data = macdata;



    return 1;

    dst->data = src->meth->dup(src->data);

    if (dst->data == NULL) {

        EVP_MAC_CTX_free(dst);

        return NULL;

    }



    return dst;

}



const EVP_MAC *EVP_MAC_CTX_mac(EVP_MAC_CTX *ctx)

crypto/evp/pkey_mac.c

+29 −17
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <openssl/err.h>

#include <openssl/evp.h>

#include "internal/evp_int.h"

#include "evp_locl.h"



/* MAC PKEY context structure */
@@ -75,15 +76,25 @@ static int pkey_mac_copy(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src) 
{

    MAC_PKEY_CTX *sctx, *dctx;



    if (!pkey_mac_init(dst))

    sctx = EVP_PKEY_CTX_get_data(src);

    if (sctx->ctx->data == NULL)

        return 0;



    sctx = EVP_PKEY_CTX_get_data(src);

    dctx = EVP_PKEY_CTX_get_data(dst);

    dctx = OPENSSL_zalloc(sizeof(*dctx));

    if (dctx == NULL) {

        EVPerr(EVP_F_PKEY_MAC_COPY, ERR_R_MALLOC_FAILURE);

        return 0;

    }



    if (!EVP_MAC_CTX_copy(dctx->ctx, sctx->ctx))

    EVP_PKEY_CTX_set_data(dst, dctx);

    dst->keygen_info_count = 0;



    dctx->ctx = EVP_MAC_CTX_dup(sctx->ctx);

    if (dctx->ctx == NULL)

        goto err;



    dctx->type = sctx->type;



    switch (dctx->type) {

    case MAC_TYPE_RAW:

        dctx->raw_data.md = sctx->raw_data.md;
@@ -141,14 +152,10 @@ static int pkey_mac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) 
        break;

    case MAC_TYPE_MAC:

        {

            EVP_MAC_CTX *cmkey = EVP_MAC_CTX_new_id(nid);

            EVP_MAC_CTX *cmkey = EVP_MAC_CTX_dup(hctx->ctx);



            if (cmkey == NULL)

                return 0;

            if (!EVP_MAC_CTX_copy(cmkey, hctx->ctx)) {

                EVP_MAC_CTX_free(cmkey);

                return 0;

            }

            EVP_PKEY_assign(pkey, nid, cmkey);

        }

        break;
@@ -249,13 +256,18 @@ static int pkey_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
        case MAC_TYPE_RAW:

            hctx->raw_data.md = p2;

            break;

        case MAC_TYPE_MAC:

            if (ctx->pkey != NULL

                && !EVP_MAC_CTX_copy(hctx->ctx,

                                     (EVP_MAC_CTX *)ctx->pkey->pkey.ptr))

        case MAC_TYPE_MAC: {

                EVP_MAC_CTX *new_mac_ctx;



                if (ctx->pkey == NULL)

                    return 0;

            if (!EVP_MAC_init(hctx->ctx))

                new_mac_ctx = EVP_MAC_CTX_dup((EVP_MAC_CTX *)ctx->pkey

                                              ->pkey.ptr);

                if (new_mac_ctx == NULL)

                    return 0;

                EVP_MAC_CTX_free(hctx->ctx);

                hctx->ctx = new_mac_ctx;

            }

            break;

        default:

            /* This should be dead code */

crypto/kdf/sskdf.c

+5 −3
Original line number Diff line number Diff line
@@ -202,9 +202,8 @@ static int SSKDF_mac_kdm(const EVP_MAC *kdf_mac, const EVP_MD *hmac_md, 
            || derived_key_len == 0)

        return 0;



    ctx = EVP_MAC_CTX_new(kdf_mac);

    ctx_init = EVP_MAC_CTX_new(kdf_mac);

    if (ctx == NULL || ctx_init == NULL)

    if (ctx_init == NULL)

        goto end;

    if (hmac_md != NULL &&

            EVP_MAC_ctrl(ctx_init, EVP_MAC_CTRL_SET_MD, hmac_md) <= 0)
@@ -233,7 +232,8 @@ static int SSKDF_mac_kdm(const EVP_MAC *kdf_mac, const EVP_MD *hmac_md, 
        c[2] = (unsigned char)((counter >> 8) & 0xff);

        c[3] = (unsigned char)(counter & 0xff);



        if (!(EVP_MAC_CTX_copy(ctx, ctx_init)

        ctx = EVP_MAC_CTX_dup(ctx_init);

        if (!(ctx != NULL

                && EVP_MAC_update(ctx, c, sizeof(c))

                && EVP_MAC_update(ctx, z, z_len)

                && EVP_MAC_update(ctx, info, info_len)))
@@ -251,6 +251,8 @@ static int SSKDF_mac_kdm(const EVP_MAC *kdf_mac, const EVP_MD *hmac_md, 
            memcpy(out, mac, len);

            break;

        }

        EVP_MAC_CTX_free(ctx);

        ctx = NULL;

    }

    ret = 1;

end: