| commit | 754106713fd349be267ec0dfe6f4f8a97c1b3cdb | [log] [tgz] |
|---|---|---|
| author | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Aug 08 09:50:01 2012 -0400 |
| committer | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Aug 08 09:50:01 2012 -0400 |
| tree | 767702dc681aea550f7c8c626e936e019981b7dc | |
| parent | ace91efcc58b8704c3e8e9c03e33afc1a59aecc3 [diff] [blame] |
#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/evp/p_open.c b/jni/openssl/crypto/evp/p_open.c index c748fbe..53a59a2 100644 --- a/jni/openssl/crypto/evp/p_open.c +++ b/jni/openssl/crypto/evp/p_open.c
@@ -115,8 +115,7 @@ int i; i=EVP_DecryptFinal_ex(ctx,out,outl); - if (i) - i = EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL); + EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL); return(i); } #else /* !OPENSSL_NO_RSA */