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 4dbaf1ea269def41073cc301fd2f90c7303b1f1f..2d46dffe7e1a4d6905620a570fb333f896be85f6 100644 (file)
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -1,5 +1,5 @@
 /* crypto/evp/p_verify.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,19 +58,17 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
-int EVP_VerifyFinal(ctx,sigbuf,siglen,pkey)
-EVP_MD_CTX *ctx;
-unsigned char *sigbuf;
-unsigned int siglen;
-EVP_PKEY *pkey;
+int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
+            unsigned int siglen, EVP_PKEY *pkey)
        {
        unsigned char m[EVP_MAX_MD_SIZE];
        unsigned int m_len;
        int i,ok=0,v;
+       MS_STATIC EVP_MD_CTX tmp_ctx;
 
        for (i=0; i<4; i++)
                {
@@ -87,13 +85,29 @@ EVP_PKEY *pkey;
                EVPerr(EVP_F_EVP_VERIFYFINAL,EVP_R_WRONG_PUBLIC_KEY_TYPE);
                return(-1);
                }
-       EVP_DigestFinal(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;
        }
+