commit 058faf1e3a8978cca7c9898ccd692fa5b738a180
author Kenny Root <kroot@google.com> Mon Dec 08 14:12:20 2014 -0800
committer Kenny Root <kroot@google.com> Mon Dec 08 16:14:56 2014 -0800
tree a021e064a3b07db885fc477a6b5d9dc78474301e
parent 53497d005a470123806d23a5d36e86cee88eafbd

NativeCrypto: throw BadPaddingException if EVP_CipherFinal_ex fails

Since nothing was being pushed onto the stack, no exception was thrown
in throwExceptionIfNecessary with the constant time fix present in
1.0.1j. The fix is to throw our own error if nothing was thrown.

(cherry picked from commit e74933ecfb7dc7d91ebe6620a91d86fdc735ed58)

Bug: 18621207
Change-Id: I25e653c493e162c5fda46f320117c013a2661aa4

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;
     }