From f847b1bef228a29e674e5f8568b4537f85ec7afb Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Fri, 28 Sep 2012 10:07:22 -0700 Subject: Allow CipherTest to run on RI (cherry picked from commit ee1cdde4bcea1635a6af99c2ada1e155cf1b7a3b) Change-Id: Idc2bbd24722f6f2ca046f8dff197c63cf9dfa03b --- .../java/org/bouncycastle/crypto/digests/AndroidDigestFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bcprov/src/main/java') 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); -- cgit v1.2.3