diff options
| author | Kenny Root <kroot@google.com> | 2013-04-30 18:48:41 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-06-03 20:31:38 -0700 |
| commit | 580c719a4c5ff483af625fcffab41678e091971d (patch) | |
| tree | 2595fa417fa3df69f939695550222a856c53e058 /bcprov/src/main | |
| parent | f847b1bef228a29e674e5f8568b4537f85ec7afb (diff) | |
| download | android_external_bouncycastle-580c719a4c5ff483af625fcffab41678e091971d.tar.gz android_external_bouncycastle-580c719a4c5ff483af625fcffab41678e091971d.tar.bz2 android_external_bouncycastle-580c719a4c5ff483af625fcffab41678e091971d.zip | |
Track changes to JSSE
Bug: 8769295
(cherry picked from commit 0f9937b494fc6dd31fd04956963a3e258aece11b)
Change-Id: I8c8f1572c79adc48b0dbd44e5c889c4432dce56a
Diffstat (limited to 'bcprov/src/main')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java index 3dc7059..b7bac28 100644 --- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java +++ b/bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java @@ -34,15 +34,18 @@ public final class AndroidDigestFactory { try { factoryImplementationClass = Class.forName(OpenSSLFactoryClassName); // Double check for NativeCrypto in case we are running on RI for testing - Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto"); + Class.forName("com.android.org.conscrypt.NativeCrypto"); } catch (ClassNotFoundException e1) { try { factoryImplementationClass = Class.forName(BouncyCastleFactoryClassName); } catch (ClassNotFoundException e2) { - throw new AssertionError("Failed to load AndroidDigestFactoryInterface " + AssertionError e = new AssertionError("Failed to load " + + "AndroidDigestFactoryInterface " + "implementation. Looked for " + OpenSSLFactoryClassName + " and " + BouncyCastleFactoryClassName); + e.initCause(e1); + throw e; } } if (!AndroidDigestFactoryInterface.class.isAssignableFrom(factoryImplementationClass)) { |