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

Fix digest signing so digest type is set after init.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2007-04-08 16:53:50 +00:00
parent 6181f5e404
commit baecb96e8a
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crypto/evp/m_sigver.c
View File

@ -67,24 +67,18 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey, const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey,
int ver) int ver)
{ {
int r = 0;
if (ctx->pctx == NULL) if (ctx->pctx == NULL)
ctx->pctx = EVP_PKEY_CTX_new(pkey, e); ctx->pctx = EVP_PKEY_CTX_new(pkey, e);
if (ctx->pctx == NULL) if (ctx->pctx == NULL)
return 0; return 0;
if (EVP_PKEY_CTX_set_signature_md(ctx->pctx, type) <= 0)
return 0;
if (pctx)
*pctx = ctx->pctx;
if (ver) if (ver)
{ {
if (ctx->pctx->pmeth->verifyctx_init) if (ctx->pctx->pmeth->verifyctx_init)
{ {
int r;
r = ctx->pctx->pmeth->verifyctx_init(ctx->pctx, ctx); r = ctx->pctx->pmeth->verifyctx_init(ctx->pctx, ctx);
if (r <= 0) if (r <= 0)
return 0; return 0;
if (r == 2)
return 1;
} }
else if (EVP_PKEY_verify_init(ctx->pctx) <= 0) else if (EVP_PKEY_verify_init(ctx->pctx) <= 0)
return 0; return 0;
@ -93,17 +87,18 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
{ {
if (ctx->pctx->pmeth->signctx_init) if (ctx->pctx->pmeth->signctx_init)
{ {
int r;
r = ctx->pctx->pmeth->signctx_init(ctx->pctx, ctx); r = ctx->pctx->pmeth->signctx_init(ctx->pctx, ctx);
if (r <= 0) if (r <= 0)
return 0; return 0;
if (r == 2)
return 1;
} }
if (EVP_PKEY_sign_init(ctx->pctx) <= 0) if (EVP_PKEY_sign_init(ctx->pctx) <= 0)
return 0; return 0;
} }
if (!EVP_DigestInit_ex(ctx, type, e)) if (EVP_PKEY_CTX_set_signature_md(ctx->pctx, type) <= 0)
return 0;
if (pctx)
*pctx = ctx->pctx;
if ((r != 2) && !EVP_DigestInit_ex(ctx, type, e))
return 0; return 0;
return 1; return 1;
} }