Flag to disable automatic copying of contexts.

[openssl.git] / crypto / evp / m_sigver.c

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index d98455eaad97f9b682f87a330ad9a420e83970af..9f83d3e25f4b03b065901fd7b8988adbaae161eb 100644 (file)
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -72,17 +72,21 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
        if (ctx->pctx == NULL)
                return 0;
 
-       if (type == NULL)
+       if (!(ctx->pctx->pmeth->flags & EVP_PKEY_FLAG_SIGCTX_CUSTOM))
                {
-               int def_nid;
-               if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) > 0)
-                       type = EVP_get_digestbynid(def_nid);
-               }
 
-       if (type == NULL)
-               {
-               EVPerr(EVP_F_DO_SIGVER_INIT, EVP_R_NO_DEFAULT_DIGEST);
-               return 0;
+               if (type == NULL)
+                       {
+                       int def_nid;
+                       if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) > 0)
+                               type = EVP_get_digestbynid(def_nid);
+                       }
+
+               if (type == NULL)
+                       {
+                       EVPerr(EVP_F_DO_SIGVER_INIT, EVP_R_NO_DEFAULT_DIGEST);
+                       return 0;
+                       }
                }
 
        if (ver)
@@ -111,6 +115,8 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
                return 0;
        if (pctx)
                *pctx = ctx->pctx;
+       if (ctx->pctx->pmeth->flags & EVP_PKEY_FLAG_SIGCTX_CUSTOM)
+               return 1;
        if (!EVP_DigestInit_ex(ctx, type, e))
                return 0;
        return 1;
@@ -131,24 +137,52 @@ int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
 int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
        {
        int sctx, r = 0;
-       if (ctx->pctx->pmeth->signctx)
+       EVP_PKEY_CTX *pctx = ctx->pctx;
+       if (pctx->pmeth->flags & EVP_PKEY_FLAG_SIGCTX_CUSTOM)
+               {
+               if (!sigret)
+                       return pctx->pmeth->signctx(pctx, sigret, siglen, ctx);
+               if (ctx->flags & EVP_MD_CTX_FLAG_FINALISE)
+                       r = pctx->pmeth->signctx(pctx, sigret, siglen, ctx);
+               else
+                       {
+                       EVP_PKEY_CTX *dctx = EVP_PKEY_CTX_dup(ctx->pctx);
+                       if (!dctx)
+                               return 0;
+                       r = dctx->pmeth->signctx(dctx, sigret, siglen, ctx);
+                       EVP_PKEY_CTX_free(dctx);
+                       }
+               return r;
+               }
+       if (pctx->pmeth->signctx)
                sctx = 1;
        else
                sctx = 0;
        if (sigret)
                {
-               MS_STATIC EVP_MD_CTX tmp_ctx;
                unsigned char md[EVP_MAX_MD_SIZE];
                unsigned int mdlen;
-               EVP_MD_CTX_init(&tmp_ctx);
-               if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
-                       return 0;
-               if (sctx)
-                       r = tmp_ctx.pctx->pmeth->signctx(tmp_ctx.pctx,
-                                       sigret, siglen, &tmp_ctx);
+               if (ctx->flags & EVP_MD_CTX_FLAG_FINALISE)
+                       {
+                       if (sctx)
+                               r = ctx->pctx->pmeth->signctx(ctx->pctx,
+                                               sigret, siglen, ctx);
+                       else
+                               r = EVP_DigestFinal_ex(ctx, md, &mdlen);
+                       }
                else
-                       r = EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen);
-               EVP_MD_CTX_cleanup(&tmp_ctx);
+                       {
+                       EVP_MD_CTX tmp_ctx;
+                       EVP_MD_CTX_init(&tmp_ctx);
+                       if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
+                               return 0;
+                       if (sctx)
+                               r = tmp_ctx.pctx->pmeth->signctx(tmp_ctx.pctx,
+                                               sigret, siglen, &tmp_ctx);
+                       else
+                               r = EVP_DigestFinal_ex(&tmp_ctx, md, &mdlen);
+                       EVP_MD_CTX_cleanup(&tmp_ctx);
+                       }
                if (sctx || !r)
                        return r;
                if (EVP_PKEY_sign(ctx->pctx, sigret, siglen, md, mdlen) <= 0)
@@ -158,13 +192,13 @@ 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 (pctx->pmeth->signctx(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)
+                       if (s < 0 || EVP_PKEY_sign(pctx, sigret, siglen, NULL, s) <= 0)
                                return 0;
                        }
                }
@@ -173,28 +207,40 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
 
 int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen)
        {
-       MS_STATIC EVP_MD_CTX tmp_ctx;
        unsigned char md[EVP_MAX_MD_SIZE];
        int r;
        unsigned int mdlen;
        int vctx;
 
-       /* FIXME: surely this should test verifyctx? (Ben 29/12/08) */
-       if (ctx->pctx->pmeth->signctx)
+       if (ctx->pctx->pmeth->verifyctx)
                vctx = 1;
        else
                vctx = 0;
-       EVP_MD_CTX_init(&tmp_ctx);
-       if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
-               return -1;      
-       if (vctx)
+       if (ctx->flags & EVP_MD_CTX_FLAG_FINALISE)
                {
-               r = tmp_ctx.pctx->pmeth->verifyctx(tmp_ctx.pctx,
-                                       sig, siglen, &tmp_ctx);
+               if (vctx)
+                       {
+                       r = ctx->pctx->pmeth->verifyctx(ctx->pctx,
+                                               sig, siglen, ctx);
+                       }
+               else
+                       r = EVP_DigestFinal_ex(ctx, md, &mdlen);
                }
        else
-               r = EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen);
-       EVP_MD_CTX_cleanup(&tmp_ctx);
+               {
+               EVP_MD_CTX tmp_ctx;
+               EVP_MD_CTX_init(&tmp_ctx);
+               if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
+                       return -1;
+               if (vctx)
+                       {
+                       r = tmp_ctx.pctx->pmeth->verifyctx(tmp_ctx.pctx,
+                                               sig, siglen, &tmp_ctx);
+                       }
+               else
+                       r = EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen);
+               EVP_MD_CTX_cleanup(&tmp_ctx);
+               }
        if (vctx || !r)
                return r;
        return EVP_PKEY_verify(ctx->pctx, sig, siglen, md, mdlen);