commit 64c8e782743fb4e820a48eb60126f3d94e233a7a
author The Android Automerger <android-build@google.com> Tue Dec 09 06:10:00 2014 -0800
committer The Android Automerger <android-build@google.com> Tue Dec 09 06:10:00 2014 -0800
tree a021e064a3b07db885fc477a6b5d9dc78474301e
parent 058faf1e3a8978cca7c9898ccd692fa5b738a180
parent 05234c014e1784d3289c0dd7d886642c13b8024a

merge in lmp-mr1-release history after reset to lmp-mr1-dev

src/main/native/org_conscrypt_NativeCrypto.cpp

diff --git a/src/main/native/org_conscrypt_NativeCrypto.cpp b/src/main/native/org_conscrypt_NativeCrypto.cpp
index af85611..0392dac 100644
--- a/src/main/native/org_conscrypt_NativeCrypto.cpp
+++ b/src/main/native/org_conscrypt_NativeCrypto.cpp
@@ -4476,8 +4476,12 @@
 
     int outl;
     if (!EVP_CipherFinal_ex(ctx, out + outOffset, &outl)) {
-        throwExceptionIfNecessary(env, "EVP_CipherFinal_ex");
-        JNI_TRACE("ctx=%p EVP_CipherFinal_ex => threw error", ctx);
+        if (throwExceptionIfNecessary(env, "EVP_CipherFinal_ex")) {
+            JNI_TRACE("ctx=%p EVP_CipherFinal_ex => threw error", ctx);
+        } else {
+            throwBadPaddingException(env, "EVP_CipherFinal_ex");
+            JNI_TRACE("ctx=%p EVP_CipherFinal_ex => threw padding exception", ctx);
+        }
         return 0;
     }