PR: 1990

[oweals/openssl.git] / crypto / evp / p_verify.c

diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index dcb54f3abb8474a348793347cd83f4a910ff16c8..2d46dffe7e1a4d6905620a570fb333f896be85f6 100644 (file)
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -62,7 +62,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-int EVP_VerifyFinal(EVP_MD_CTX *ctx, unsigned char *sigbuf,
+int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
             unsigned int siglen, EVP_PKEY *pkey)
        {
        unsigned char m[EVP_MAX_MD_SIZE];
@@ -85,15 +85,29 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, unsigned char *sigbuf,
                EVPerr(EVP_F_EVP_VERIFYFINAL,EVP_R_WRONG_PUBLIC_KEY_TYPE);
                return(-1);
                }
-       EVP_MD_CTX_copy(&tmp_ctx,ctx);     
-       EVP_DigestFinal(&tmp_ctx,&(m[0]),&m_len);
-        if (ctx->digest->verify == NULL)
+       if (ctx->digest->verify == NULL)
                 {
                EVPerr(EVP_F_EVP_VERIFYFINAL,EVP_R_NO_VERIFY_FUNCTION_CONFIGURED);
                return(0);
                }
 
-       return(ctx->digest->verify(ctx->digest->type,m,m_len,
-               sigbuf,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->verify(ctx->digest->type,
+                       NULL, -1, sigbuf, siglen, &sctmp);
+               }
+       else
+               {
+               EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len);
+               i = ctx->digest->verify(ctx->digest->type,m,m_len,
+                                       sigbuf,siglen,pkey->pkey.ptr);
+               }
+       EVP_MD_CTX_cleanup(&tmp_ctx);
+       return i;
        }