X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fevp%2Fp_sign.c;h=1889117d39ccce2aa822738da1496d1b71a98edd;hb=0d263d2acf54d92fb2026813bc4b2969b64de94a;hp=8df6d48a7ec0892d554d89839fa17039eb119793;hpb=0e3453536ec9ce09e4dd276c2fa4d62e362789e9;p=oweals%2Fopenssl.git

diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index 8df6d48a7e..1889117d39 100644
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -80,18 +80,30 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
 	{
 	unsigned char m[EVP_MAX_MD_SIZE];
 	unsigned int m_len;
-	int i,ok=0,v;
-	MS_STATIC EVP_MD_CTX tmp_ctx;
+	int i = 0,ok = 0,v;
+	EVP_PKEY_CTX *pkctx = NULL;
 
 	*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);
+	if (ctx->flags & EVP_MD_CTX_FLAG_FINALISE)
+		{
+		if (!EVP_DigestFinal_ex(ctx, m, &m_len))
+			goto err;
+		}
+	else
+		{
+		int rv;
+		EVP_MD_CTX tmp_ctx;
+		EVP_MD_CTX_init(&tmp_ctx);
+		rv = EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);
+		if (rv)
+			rv = EVP_DigestFinal_ex(&tmp_ctx, m, &m_len);
+		EVP_MD_CTX_cleanup(&tmp_ctx);
+		if (!rv)
+			return 0;
+		}
 
 	if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
 		{
-		EVP_PKEY_CTX *pkctx = NULL;
 		size_t sltmp = (size_t)EVP_PKEY_size(pkey);
 		i = 0;
 		pkctx = EVP_PKEY_CTX_new(pkey, NULL);
@@ -131,7 +143,7 @@ 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));
+	return ctx->digest->sign(ctx->digest->type,m,m_len,sigret,siglen,
+		pkey->pkey.ptr);
 	}