resolve conflicts

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c
index 5f387a94d3..f8650d5df6 100644
--- a/src/lib/libcrypto/evp/evp_key.c
+++ b/src/lib/libcrypto/evp/evp_key.c
@@ -126,7 +126,8 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
         EVP_MD_CTX_init(&c);
         for (;;)
                 {
-                EVP_DigestInit_ex(&c,md, NULL);
+                if (!EVP_DigestInit_ex(&c,md, NULL))
+                        return 0;
                 if (addmd++)
                         EVP_DigestUpdate(&c,&(md_buf[0]),mds);
                 EVP_DigestUpdate(&c,data,datal);