diff options
| author | Kenny Root <kroot@google.com> | 2013-04-30 04:02:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-30 04:02:11 +0000 |
| commit | ba6f0e8916f705df7e9ae666e9fc5a18cef0f273 (patch) | |
| tree | 596564866938f010b7103c71f697a35a5a391fbc /patches | |
| parent | 13a304fc33c5d9fbee0b6da3a2f53ee3284c91bf (diff) | |
| parent | 142ad143c914fba3342822034f18db341647b58f (diff) | |
| download | android_external_bouncycastle-ba6f0e8916f705df7e9ae666e9fc5a18cef0f273.tar.gz android_external_bouncycastle-ba6f0e8916f705df7e9ae666e9fc5a18cef0f273.tar.bz2 android_external_bouncycastle-ba6f0e8916f705df7e9ae666e9fc5a18cef0f273.zip | |
Merge "Track change to JSSE provider"
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/bcprov.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/bcprov.patch b/patches/bcprov.patch index c72b40f..803992c 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -530,7 +530,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 @@ -550,7 +550,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; + +/** |