diff options
| author | Kenny Root <kroot@google.com> | 2013-04-23 22:37:59 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 14:56:26 -0700 |
| commit | 142ad143c914fba3342822034f18db341647b58f (patch) | |
| tree | e16118b8888ad79725b013cdba8b023613de464e | |
| parent | 7d18f46ad1dc37e346d5eaf896bc6f2319cee728 (diff) | |
| download | bouncycastle-142ad143c914fba3342822034f18db341647b58f.tar.gz | |
Track change to JSSE provider
Change-Id: Iaef3e3f325e43736fa19c701f6609e5ffd1535fa
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java | 2 | ||||
| -rw-r--r-- | patches/bcprov.patch | 4 |
3 files changed, 6 insertions, 5 deletions
@@ -31,7 +31,7 @@ LOCAL_MODULE := bouncycastle LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 -LOCAL_JAVA_LIBRARIES := core +LOCAL_JAVA_LIBRARIES := conscrypt core LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -43,7 +43,7 @@ LOCAL_MODULE := bouncycastle-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 -LOCAL_JAVA_LIBRARIES := core +LOCAL_JAVA_LIBRARIES := conscrypt core LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) @@ -96,6 +96,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_BUILD_HOST_DEX := true LOCAL_MODULE_TAGS := optional + LOCAL_JAVA_LIBRARIES := conscrypt-hostdex LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java index 3e7c0e7c..07b4e503 100644 --- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java +++ b/bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java @@ -16,7 +16,7 @@ package org.bouncycastle.crypto.digests; -import org.apache.harmony.xnet.provider.jsse.NativeCrypto; +import com.android.org.conscrypt.NativeCrypto; import org.bouncycastle.crypto.ExtendedDigest; /** diff --git a/patches/bcprov.patch b/patches/bcprov.patch index 695215bd..4e0285e4 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; + +/** |