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

Revert broken change to ccgost. 

Initialize context properly for HMAC pkey method.
parent a1a382db

crypto/hmac/hm_pmeth.c

+4 −1
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ 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;

engines/ccgost/gost_pmeth.c

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