resolve conflicts

1 files changed, 18 insertions, 6 deletions

diff --git a/src/lib/libcrypto/evp/p_sign.c b/src/lib/libcrypto/evp/p_sign.c
index e4ae5906f5..bf41a0db68 100644
--- a/src/lib/libcrypto/evp/p_sign.c
+++ b/src/lib/libcrypto/evp/p_sign.c
@@ -84,10 +84,6 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
         MS_STATIC EVP_MD_CTX tmp_ctx;
 
         *siglen=0;
-        EVP_MD_CTX_init(&tmp_ctx);
-        EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);   
-        EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len);
-        EVP_MD_CTX_cleanup(&tmp_ctx);
         for (i=0; i<4; i++)
                 {
                 v=ctx->digest->required_pkey_type[i];
@@ -108,7 +104,23 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
                 EVPerr(EVP_F_EVP_SIGNFINAL,EVP_R_NO_SIGN_FUNCTION_CONFIGURED);
                 return(0);
                 }
-        return(ctx->digest->sign(ctx->digest->type,m,m_len,sigret,siglen,
-                pkey->pkey.ptr));
+        EVP_MD_CTX_init(&tmp_ctx);
+        EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);
+        if (ctx->digest->flags & EVP_MD_FLAG_SVCTX)
+                {
+                EVP_MD_SVCTX sctmp;
+                sctmp.mctx = &tmp_ctx;
+                sctmp.key = pkey->pkey.ptr;
+                i = ctx->digest->sign(ctx->digest->type,
+                        NULL, -1, sigret, siglen, &sctmp);
+                }
+        else
+                {
+                EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len);
+                i = ctx->digest->sign(ctx->digest->type,m,m_len,sigret,siglen,
+                                        pkey->pkey.ptr);
+                }
+        EVP_MD_CTX_cleanup(&tmp_ctx);
+        return i;
         }