resolve conflicts

1 files changed, 18 insertions, 9 deletions

diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c
index 839d6a3a16..7961fbebf2 100644
--- a/src/lib/libcrypto/evp/evp_key.c
+++ b/src/lib/libcrypto/evp/evp_key.c
@@ -120,7 +120,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
         unsigned char md_buf[EVP_MAX_MD_SIZE];
         int niv,nkey,addmd=0;
         unsigned int mds=0,i;
-
+        int rv = 0;
         nkey=type->key_len;
         niv=type->iv_len;
         OPENSSL_assert(nkey <= EVP_MAX_KEY_LENGTH);
@@ -134,17 +134,24 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
                 if (!EVP_DigestInit_ex(&c,md, NULL))
                         return 0;
                 if (addmd++)
-                        EVP_DigestUpdate(&c,&(md_buf[0]),mds);
-                EVP_DigestUpdate(&c,data,datal);
+                        if (!EVP_DigestUpdate(&c,&(md_buf[0]),mds))
+                                goto err;
+                if (!EVP_DigestUpdate(&c,data,datal))
+                        goto err;
                 if (salt != NULL)
-                        EVP_DigestUpdate(&c,salt,PKCS5_SALT_LEN);
-                EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds);
+                        if (!EVP_DigestUpdate(&c,salt,PKCS5_SALT_LEN))
+                                goto err;
+                if (!EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds))
+                        goto err;
 
                 for (i=1; i<(unsigned int)count; i++)
                         {
-                        EVP_DigestInit_ex(&c,md, NULL);
-                        EVP_DigestUpdate(&c,&(md_buf[0]),mds);
-                        EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds);
+                        if (!EVP_DigestInit_ex(&c,md, NULL))
+                                goto err;
+                        if (!EVP_DigestUpdate(&c,&(md_buf[0]),mds))
+                                goto err;
+                        if (!EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds))
+                                goto err;
                         }
                 i=0;
                 if (nkey)
@@ -173,8 +180,10 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
                         }
                 if ((nkey == 0) && (niv == 0)) break;
                 }
+        rv = type->key_len;
+        err:
         EVP_MD_CTX_cleanup(&c);
         OPENSSL_cleanse(&(md_buf[0]),EVP_MAX_MD_SIZE);
-        return(type->key_len);
+        return rv;
         }