generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Copy update callback across when copying EVP_MD_CTX.

Browse Source 
Remove unnecessary reference to EVP_MD_CTX in HMAC pkey method.
This commit is contained in:
Dr. Stephen Henson 2007-04-12 13:02:31 +00:00
parent 2022cfe07e
commit 18327cd0e4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/digest.c
View File

@ -292,6 +292,8 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
memcpy(out->md_data,in->md_data,out->digest->ctx_size);
}
out->update = in->update;
if (in->pctx)
{
out->pctx = EVP_PKEY_CTX_dup(in->pctx);

4
crypto/hmac/hm_pmeth.c
View File

@ -68,7 +68,6 @@
typedef struct
{
const EVP_MD *md; /* MD for HMAC use */
EVP_MD_CTX *mctx; /* Parent EVP_MD_CTX */
ASN1_OCTET_STRING ktmp; /* Temp storage for key */
HMAC_CTX ctx;
} HMAC_PKEY_CTX;
@ -80,7 +79,6 @@ static int pkey_hmac_init(EVP_PKEY_CTX *ctx)
if (!hctx)
return 0;
hctx->md = NULL;
hctx->mctx = NULL;
hctx->ktmp.data = NULL;
HMAC_CTX_init(&hctx->ctx);
@ -145,8 +143,6 @@ static int int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
static int hmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)
{
HMAC_PKEY_CTX *hctx = ctx->data;
hctx->mctx = mctx;
EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
mctx->update = int_update;
return 1;