Revert broken change to ccgost.
authorDr. Stephen Henson <steve@openssl.org>
Tue, 22 May 2007 12:58:39 +0000 (12:58 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 22 May 2007 12:58:39 +0000 (12:58 +0000)
Initialize context properly for HMAC pkey method.

crypto/hmac/hm_pmeth.c
engines/ccgost/gost_pmeth.c

index 53a3f00..27a5c8e 100644 (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;
        }
 
index 03e0244..746e681 100644 (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;