#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/evp/evp_key.c b/jni/openssl/crypto/evp/evp_key.c
index 7961fbe..839d6a3 100644
--- a/jni/openssl/crypto/evp/evp_key.c
+++ b/jni/openssl/crypto/evp/evp_key.c
@@ -120,7 +120,7 @@
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,24 +134,17 @@
if (!EVP_DigestInit_ex(&c,md, NULL))
return 0;
if (addmd++)
- if (!EVP_DigestUpdate(&c,&(md_buf[0]),mds))
- goto err;
- if (!EVP_DigestUpdate(&c,data,datal))
- goto err;
+ EVP_DigestUpdate(&c,&(md_buf[0]),mds);
+ EVP_DigestUpdate(&c,data,datal);
if (salt != NULL)
- if (!EVP_DigestUpdate(&c,salt,PKCS5_SALT_LEN))
- goto err;
- if (!EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds))
- goto err;
+ EVP_DigestUpdate(&c,salt,PKCS5_SALT_LEN);
+ EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds);
for (i=1; i<(unsigned int)count; i++)
{
- 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;
+ EVP_DigestInit_ex(&c,md, NULL);
+ EVP_DigestUpdate(&c,&(md_buf[0]),mds);
+ EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds);
}
i=0;
if (nkey)
@@ -180,10 +173,8 @@
}
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 rv;
+ return(type->key_len);
}