Flag to disable automatic copying of contexts.

Some functions such as EVP_VerifyFinal only finalise a copy of the passed
context in case an application wants to digest more data. Doing this when
it is not needed is inefficient and many applications don't require it.

For compatibility the default is to still finalise a copy unless the
flag EVP_MD_CTX_FLAG_FINALISE is set in which case the passed
context is finalised an *no* further data can be digested after
finalisation.

1 files changed, 17 insertions, 7 deletions

diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index c66d63ccf8..a3df5dfc3d 100644
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -68,15 +68,25 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
 	unsigned char m[EVP_MAX_MD_SIZE];
 	unsigned int m_len;
 	int i = 0,ok = 0,v;
-	EVP_MD_CTX tmp_ctx;
 	EVP_PKEY_CTX *pkctx = NULL;
 
-	EVP_MD_CTX_init(&tmp_ctx);
-	if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
-		goto err;    
-	if (!EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len))
-		goto err;
-	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)
 		{