summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-04-23 22:37:59 -0700
committerKenny Root <kroot@google.com>2013-04-29 14:56:26 -0700
commit142ad143c914fba3342822034f18db341647b58f (patch)
treee16118b8888ad79725b013cdba8b023613de464e /patches
parent7d18f46ad1dc37e346d5eaf896bc6f2319cee728 (diff)
downloadandroid_external_bouncycastle-142ad143c914fba3342822034f18db341647b58f.tar.gz
android_external_bouncycastle-142ad143c914fba3342822034f18db341647b58f.tar.bz2
android_external_bouncycastle-142ad143c914fba3342822034f18db341647b58f.zip
Track change to JSSE provider
Change-Id: Iaef3e3f325e43736fa19c701f6609e5ffd1535fa
Diffstat (limited to 'patches')
-rw-r--r--patches/bcprov.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/bcprov.patch b/patches/bcprov.patch
index 695215b..4e0285e 100644
--- a/patches/bcprov.patch
+++ b/patches/bcprov.patch
@@ -508,7 +508,7 @@ diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/crypto/digests/AndroidDigest
+}
diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/crypto/digests/OpenSSLDigest.java bcprov-jdk15on-148/org/bouncycastle/crypto/digests/OpenSSLDigest.java
--- bcprov-jdk15on-148.orig/org/bouncycastle/crypto/digests/OpenSSLDigest.java 1970-01-01 00:00:00.000000000 +0000
-+++ bcprov-jdk15on-148/org/bouncycastle/crypto/digests/OpenSSLDigest.java 2013-02-28 01:42:11.000000000 +0000
++++ bcprov-jdk15on-148/org/bouncycastle/crypto/digests/OpenSSLDigest.java 2013-04-24 05:37:59.000000000 +0000
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
@@ -528,7 +528,7 @@ diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/crypto/digests/OpenSSLDigest
+
+package org.bouncycastle.crypto.digests;
+
-+import org.apache.harmony.xnet.provider.jsse.NativeCrypto;
++import com.android.org.conscrypt.NativeCrypto;
+import org.bouncycastle.crypto.ExtendedDigest;
+
+/**