diff options
| author | Ben Laurie <ben@openssl.org> | 2008-12-29 16:11:58 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2008-12-29 16:11:58 +0000 |
| commit | 0eab41fb78cf4d7c76e563fd677ab6c32fc28bb0 (patch) | |
| tree | da848c7424ced86fc60823f4948b0fc79e52a381 /crypto/evp/m_sigver.c | |
| parent | 8aa02e97a782a4229936d5df6da42db3efe4acd1 (diff) | |
If we're going to return errors (no matter how stupid), then we should
test for them!
Diffstat (limited to 'crypto/evp/m_sigver.c')
| -rw-r--r-- | crypto/evp/m_sigver.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c index c6d257fc08..d98455eaad 100644 --- a/crypto/evp/m_sigver.c +++ b/crypto/evp/m_sigver.c @@ -128,7 +128,6 @@ int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, return do_sigver_init(ctx, pctx, type, e, pkey, 1); } - int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen) { int sctx, r = 0; @@ -159,13 +158,15 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen) { if (sctx) { - if (ctx->pctx->pmeth->signctx(ctx->pctx, - sigret, siglen, ctx) <= 0) + if (ctx->pctx->pmeth->signctx(ctx->pctx, sigret, siglen, ctx) <= 0) + return 0; + } + else + { + int s = EVP_MD_size(ctx->digest); + if (s < 0 || EVP_PKEY_sign(ctx->pctx, sigret, siglen, NULL, s) <= 0) return 0; } - else if (EVP_PKEY_sign(ctx->pctx, sigret, siglen, NULL, - EVP_MD_size(ctx->digest)) <= 0) - return 0; } return 1; } @@ -177,6 +178,8 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen) int r; unsigned int mdlen; int vctx; + + /* FIXME: surely this should test verifyctx? (Ben 29/12/08) */ if (ctx->pctx->pmeth->signctx) vctx = 1; else |