1 files changed, 26 insertions, 16 deletions

diff --git a/Cryptlib/OpenSSL/crypto/evp/p_verify.c b/Cryptlib/OpenSSL/crypto/evp/p_verify.c
index ee2f2574..65e1e216 100644
--- a/Cryptlib/OpenSSL/crypto/evp/p_verify.c
+++ b/Cryptlib/OpenSSL/crypto/evp/p_verify.c
@@ -67,8 +67,31 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
 {
     unsigned char m[EVP_MAX_MD_SIZE];
     unsigned int m_len;
-    int i, ok = 0, v;
+    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->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) {
+        i = -1;
+        pkctx = EVP_PKEY_CTX_new(pkey, NULL);
+        if (!pkctx)
+            goto err;
+        if (EVP_PKEY_verify_init(pkctx) <= 0)
+            goto err;
+        if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0)
+            goto err;
+        i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len);
+ err:
+        EVP_PKEY_CTX_free(pkctx);
+        return i;
+    }
 
     for (i = 0; i < 4; i++) {
         v = ctx->digest->required_pkey_type[i];
@@ -88,19 +111,6 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
         return (0);
     }
 
-    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;
+    return (ctx->digest->verify(ctx->digest->type, m, m_len,
+                                sigbuf, siglen, pkey->pkey.ptr));
 }