commit 35c2503a9f1a27c0101d4f149c6cb846a53ae694
author Kenny Root <kroot@google.com> Thu Jun 11 12:58:31 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 11 14:38:56 2015 -0700
tree 10055528726cb147412ac656d2c552d886469c8d
parent 5cb1a59d68bce39eac078cecec784f6e7c2ad01c

Fix error conditions in certificate/PKCS#7 reading

When an error condition is encountered in BoringSSL, sometimes it
deliberately does not put something on the ERR stack to prevent abuse of
that knowledge. Instead we need to throw an exception explicitly when no
error is pushed onto the stack.

(cherry picked from commit 79f05f46c8fb2f19c8d11564ef93ef332f79fdc9)

Bug: 21034231
Change-Id: Ia06347c5653672c982ecff2c26be9b091d03009f

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 96cb0d6..581ef32 100644
--- a/src/main/native/org_conscrypt_NativeCrypto.cpp
+++ b/src/main/native/org_conscrypt_NativeCrypto.cpp
@@ -498,6 +498,16 @@
     return jniThrowException(env, "java/security/NoSuchAlgorithmException", message);
 }
 
+/**
+ * Throws a ParsingException with the given string as a message.
+ */
+static int throwParsingException(JNIEnv* env, const char* message) {
+    return jniThrowException(
+            env,
+            TO_STRING(JNI_JARJAR_PREFIX) "org/conscrypt/OpenSSLX509CertificateFactory$ParsingException",
+            message);
+}
+
 static int throwForAsn1Error(JNIEnv* env, int reason, const char *message,
                              int (*defaultThrow)(JNIEnv*, const char*)) {
     switch (reason) {
@@ -6627,8 +6637,10 @@
 
     switch (which) {
     case PKCS7_CERTS:
+        JNI_TRACE("d2i_PKCS7_bio(%p, %d) => returned", bio, which);
         return PKCS7_to_ItemArray<X509, STACK_OF(X509)>(env, PKCS7_get_certs(pkcs7.get()), X509_dup);
     case PKCS7_CRLS:
+        JNI_TRACE("d2i_PKCS7_bio(%p, %d) => returned", bio, which);
         return PKCS7_to_ItemArray<X509_CRL, STACK_OF(X509_CRL)>(env, PKCS7_get_CRLs(pkcs7.get()),
                 X509_CRL_dup);
     default:
@@ -6639,7 +6651,10 @@
     uint8_t *data;
     size_t len;
     if (!BIO_read_asn1(bio, &data, &len, 256 * 1024 * 1024 /* max length, 256MB for sanity */)) {
-        throwExceptionIfNecessary(env, "Error reading from BIO");
+        if (!throwExceptionIfNecessary(env, "Error reading PKCS#7 data")) {
+            throwParsingException(env, "Error reading PKCS#7 data");
+        }
+        JNI_TRACE("d2i_PKCS7_bio(%p, %d) => error reading BIO", bio, which);
         return 0;
     }
     Unique_OPENSSL_str data_storage(data);
@@ -6650,16 +6665,24 @@
     if (which == PKCS7_CERTS) {
         Unique_sk_X509 outCerts(sk_X509_new_null());
         if (!PKCS7_get_certificates(outCerts.get(), &cbs)) {
-            throwExceptionIfNecessary(env, "PKCS7_get_certificates");
+            if (!throwExceptionIfNecessary(env, "PKCS7_get_certificates")) {
+                throwParsingException(env, "Error parsing PKCS#7 certificate data");
+            }
+            JNI_TRACE("d2i_PKCS7_bio(%p, %d) => error reading certs", bio, which);
             return 0;
         }
+        JNI_TRACE("d2i_PKCS7_bio(%p, %d) => success certs", bio, which);
         return PKCS7_to_ItemArray<X509, STACK_OF(X509)>(env, outCerts.get(), X509_dup);
     } else if (which == PKCS7_CRLS) {
         Unique_sk_X509_CRL outCRLs(sk_X509_CRL_new_null());
         if (!PKCS7_get_CRLs(outCRLs.get(), &cbs)) {
-            throwExceptionIfNecessary(env, "PKCS7_get_CRLs");
+            if (!throwExceptionIfNecessary(env, "PKCS7_get_CRLs")) {
+                throwParsingException(env, "Error parsing PKCS#7 CRL data");
+            }
+            JNI_TRACE("d2i_PKCS7_bio(%p, %d) => error reading CRLs", bio, which);
             return 0;
         }
+        JNI_TRACE("d2i_PKCS7_bio(%p, %d) => success CRLs", bio, which);
         return PKCS7_to_ItemArray<X509_CRL, STACK_OF(X509_CRL)>(
             env, outCRLs.get(), X509_CRL_dup);
     } else {
@@ -6683,6 +6706,7 @@
     Unique_sk_X509 path((PKIPATH*) ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKIPATH), bio, NULL));
     if (path.get() == NULL) {
         throwExceptionIfNecessary(env, "ASN1_seq_unpack_X509_bio");
+        JNI_TRACE("ASN1_seq_unpack_X509_bio(%p) => threw error", bio);
         return NULL;
     }