diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-06-04 03:52:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-04 03:52:54 +0000 |
| commit | ff9f947b1f1db149cf394e8184d6db4d66d1e319 (patch) | |
| tree | 2595fa417fa3df69f939695550222a856c53e058 /patches/bcprov.patch | |
| parent | dbfdf24c935c831243836be693b722db8f4fe0d4 (diff) | |
| parent | 580c719a4c5ff483af625fcffab41678e091971d (diff) | |
| download | android_external_bouncycastle-ff9f947b1f1db149cf394e8184d6db4d66d1e319.tar.gz android_external_bouncycastle-ff9f947b1f1db149cf394e8184d6db4d66d1e319.tar.bz2 android_external_bouncycastle-ff9f947b1f1db149cf394e8184d6db4d66d1e319.zip | |
Merge changes I8c8f1572,Idc2bbd24
* changes:
Track changes to JSSE
Allow CipherTest to run on RI
Diffstat (limited to 'patches/bcprov.patch')
| -rw-r--r-- | patches/bcprov.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/patches/bcprov.patch b/patches/bcprov.patch index 744a5a4..e6e7f40 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -313,8 +313,8 @@ diff -Naur bcprov-jdk15on-149.orig/org/bouncycastle/asn1/x509/X509NameTokenizer. } diff -Naur bcprov-jdk15on-149.orig/org/bouncycastle/crypto/digests/AndroidDigestFactory.java bcprov-jdk15on-149/org/bouncycastle/crypto/digests/AndroidDigestFactory.java --- bcprov-jdk15on-149.orig/org/bouncycastle/crypto/digests/AndroidDigestFactory.java 1970-01-01 00:00:00.000000000 +0000 -+++ bcprov-jdk15on-149/org/bouncycastle/crypto/digests/AndroidDigestFactory.java 2012-09-17 23:04:47.000000000 +0000 -@@ -0,0 +1,78 @@ ++++ bcprov-jdk15on-149/org/bouncycastle/crypto/digests/AndroidDigestFactory.java 2013-05-01 01:48:41.000000000 +0000 +@@ -0,0 +1,83 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * @@ -350,14 +350,19 @@ diff -Naur bcprov-jdk15on-149.orig/org/bouncycastle/crypto/digests/AndroidDigest + Class factoryImplementationClass; + try { + factoryImplementationClass = Class.forName(OpenSSLFactoryClassName); ++ // Double check for NativeCrypto in case we are running on RI for testing ++ Class.forName("com.android.org.conscrypt.NativeCrypto"); + } catch (ClassNotFoundException e1) { + try { + factoryImplementationClass = Class.forName(BouncyCastleFactoryClassName); + } catch (ClassNotFoundException e2) { -+ throw new AssertionError("Failed to find 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)) { |