mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert broken change to ccgost.

Browse Source 
Initialize context properly for HMAC pkey method.
This commit is contained in:
Dr. Stephen Henson 2007-05-22 12:58:39 +00:00
parent a1a382dbc9
commit 7b8b797375
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/hmac/hm_pmeth.c
View File

@ -80,11 +80,14 @@ static int pkey_hmac_init(EVP_PKEY_CTX *ctx)
return 0;
hctx->md = NULL;
hctx->ktmp.data = NULL;
hctx->ktmp.length = 0;
hctx->ktmp.flags = 0;
hctx->ktmp.type = V_ASN1_OCTET_STRING;
HMAC_CTX_init(&hctx->ctx);
ctx->data = hctx;
ctx->keygen_info_count = 0;
return 1;
}

2
engines/ccgost/gost_pmeth.c
View File

@ -545,7 +545,7 @@ static int pkey_gost_mac_ctrl (EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
{
case EVP_PKEY_CTRL_MD:
{
if (p2 != NULL)
if (EVP_MD_type((const EVP_MD *)p2) != NID_id_Gost28147_89_MAC)
{
GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL, GOST_R_INVALID_DIGEST_TYPE);
return 0;