From 67227f4aa000f04e807d42f86b8d175bfe169ace Mon Sep 17 00:00:00 2001 From: Vineet Garg Date: Sun, 28 Jun 2015 20:40:45 +0530 Subject: [PATCH] Added conscrypt readme --- libs/conscrypt.readme | 18 ++++++++++++++++++ src/org/kde/kdeconnect/BackgroundService.java | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 libs/conscrypt.readme diff --git a/libs/conscrypt.readme b/libs/conscrypt.readme new file mode 100644 index 00000000..30e9d717 --- /dev/null +++ b/libs/conscrypt.readme @@ -0,0 +1,18 @@ +Conscrypt + +https://conscrypt.org/ + +Conscrypt is a Java Security Provider that uses OpenSSL. Since Android uses it internally too, but that is not updated. These libraries are built directly form AOSP source on 28-Jun-2015. + +The source for conscrypt is availble at https://android.googlesource.com/platform/external/conscrypt + +The structure of two jar files used here is as follows : +conscrypt.jar is the Java library for OpenSSL Provider. +conscrypt_jni.jar is shared library for JNI for OpenSSL Provider, packed into a jar. + +To update these libraries, they can be diretly built from AOSP with build type as "user" + +conscrypt.jar = $OUT_DIR/target/common/obj/JAVA_LIBRARIES/conscrypt_unbundled_intermediates/javalib.jar +conscrypt_jni.jar = $OUT_DIR/target/product/generic/obj/lib/libconscrypt_jni.so +and put as lib/armeabi/libconscrypt_jni.so and compress lib directory as jar archive. + diff --git a/src/org/kde/kdeconnect/BackgroundService.java b/src/org/kde/kdeconnect/BackgroundService.java index 18e23fe5..3754bdf5 100644 --- a/src/org/kde/kdeconnect/BackgroundService.java +++ b/src/org/kde/kdeconnect/BackgroundService.java @@ -199,7 +199,7 @@ public class BackgroundService extends Service { @Override public void onCreate() { super.onCreate(); - + Security.insertProviderAt(new OpenSSLProvider("KDEConnect SSL Provider"), 1); // Register screen on listener