diff options
| author | Kenny Root <kroot@google.com> | 2013-05-01 02:11:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-01 02:11:56 +0000 |
| commit | dc71fa660834a8e0f7c371a1b548b76785b43e26 (patch) | |
| tree | 738a6ccd40c638c3e290cd57ffd534327cbe5d0d /bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java | |
| parent | 4ecc471d62fa039bf8a60844ea1c67b2610a505d (diff) | |
| parent | 0f9937b494fc6dd31fd04956963a3e258aece11b (diff) | |
| download | android_external_bouncycastle-dc71fa660834a8e0f7c371a1b548b76785b43e26.tar.gz android_external_bouncycastle-dc71fa660834a8e0f7c371a1b548b76785b43e26.tar.bz2 android_external_bouncycastle-dc71fa660834a8e0f7c371a1b548b76785b43e26.zip | |
Merge "Track changes to JSSE"
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java')
| -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)) { |