resolve conflicts

1 files changed, 6 insertions, 4 deletions

diff --git a/src/lib/libcrypto/evp/p_verify.c b/src/lib/libcrypto/evp/p_verify.c
index 41d4b67130..5f5c409f45 100644
--- a/src/lib/libcrypto/evp/p_verify.c
+++ b/src/lib/libcrypto/evp/p_verify.c
@@ -67,17 +67,19 @@ 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=-1,ok=0,v;
         EVP_MD_CTX tmp_ctx;
+        EVP_PKEY_CTX *pkctx = NULL;
 
         EVP_MD_CTX_init(&tmp_ctx);
-        EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);     
-        EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len);
+        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)
                 {
-                EVP_PKEY_CTX *pkctx = NULL;
                 i = -1;
                 pkctx = EVP_PKEY_CTX_new(pkey, NULL);
                 if (!pkctx)