diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-09-28 10:07:22 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-06-03 20:24:37 -0700 |
| commit | f847b1bef228a29e674e5f8568b4537f85ec7afb (patch) | |
| tree | 9891c94876bf2077205079da00e6b657950e3e0f /bcprov | |
| parent | dbfdf24c935c831243836be693b722db8f4fe0d4 (diff) | |
| download | android_external_bouncycastle-f847b1bef228a29e674e5f8568b4537f85ec7afb.tar.gz android_external_bouncycastle-f847b1bef228a29e674e5f8568b4537f85ec7afb.tar.bz2 android_external_bouncycastle-f847b1bef228a29e674e5f8568b4537f85ec7afb.zip | |
Allow CipherTest to run on RI
(cherry picked from commit ee1cdde4bcea1635a6af99c2ada1e155cf1b7a3b)
Change-Id: Idc2bbd24722f6f2ca046f8dff197c63cf9dfa03b
Diffstat (limited to 'bcprov')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java | 4 |
1 files changed, 3 insertions, 1 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 1a82a46..3dc7059 100644 --- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java +++ b/bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java @@ -33,11 +33,13 @@ public final class AndroidDigestFactory { Class factoryImplementationClass; 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"); } catch (ClassNotFoundException e1) { try { factoryImplementationClass = Class.forName(BouncyCastleFactoryClassName); } catch (ClassNotFoundException e2) { - throw new AssertionError("Failed to find AndroidDigestFactoryInterface " + throw new AssertionError("Failed to load AndroidDigestFactoryInterface " + "implementation. Looked for " + OpenSSLFactoryClassName + " and " + BouncyCastleFactoryClassName); |