Moving back to non platform bouncycastle

- Using unbundled bouncycastle
- Statically link against bouncycastle
- Not using platform bouncycastle

Change-Id: I8167032d898aedc272047e3f036a87d64091ce8d

Conflicts:
	Android.mk

3 files changed, 21 insertions, 22 deletions

diff --git a/Android.mk b/Android.mk
index 2f61136..bf14e9f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,9 +13,8 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := current
 
-LOCAL_JAVA_LIBRARIES := \
-	bouncycastle \
-	conscrypt
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    bouncycastle-unbundled
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
diff --git a/java/src/com/google/polo/ssl/SSLSocketFactoryWrapper.java b/java/src/com/google/polo/ssl/SSLSocketFactoryWrapper.java
index a611daf..5532155 100644
--- a/java/src/com/google/polo/ssl/SSLSocketFactoryWrapper.java
+++ b/java/src/com/google/polo/ssl/SSLSocketFactoryWrapper.java
@@ -52,7 +52,7 @@ public class SSLSocketFactoryWrapper extends SSLSocketFactory {
       TrustManager[] trustManagers) throws NoSuchAlgorithmException,
       KeyManagementException {
     java.security.Security.addProvider(
-        new com.android.org.bouncycastle.jce.provider.BouncyCastleProvider());
+        new org.bouncycastle.jce.provider.BouncyCastleProvider());
     
     SSLContext sslcontext = SSLContext.getInstance("TLS");
     sslcontext.init(keyManagers, trustManagers, null);
diff --git a/java/src/com/google/polo/ssl/SslUtil.java b/java/src/com/google/polo/ssl/SslUtil.java
index bc1310c..cf0b3da 100644
--- a/java/src/com/google/polo/ssl/SslUtil.java
+++ b/java/src/com/google/polo/ssl/SslUtil.java
@@ -16,22 +16,22 @@
 
 package com.google.polo.ssl;
 
-import com.android.org.bouncycastle.asn1.ASN1InputStream;
-import com.android.org.bouncycastle.asn1.ASN1Sequence;
-import com.android.org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import com.android.org.bouncycastle.asn1.x509.BasicConstraints;
-import com.android.org.bouncycastle.asn1.x509.ExtendedKeyUsage;
-import com.android.org.bouncycastle.asn1.x509.GeneralName;
-import com.android.org.bouncycastle.asn1.x509.GeneralNames;
-import com.android.org.bouncycastle.asn1.x509.KeyPurposeId;
-import com.android.org.bouncycastle.asn1.x509.KeyUsage;
-import com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import com.android.org.bouncycastle.asn1.x509.X509Extensions;
-import com.android.org.bouncycastle.asn1.x509.X509Name;
-import com.android.org.bouncycastle.x509.X509V1CertificateGenerator;
-import com.android.org.bouncycastle.x509.X509V3CertificateGenerator;
-import com.android.org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
-import com.android.org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
+import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1Sequence;
+import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
+import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralNames;
+import org.bouncycastle.asn1.x509.KeyPurposeId;
+import org.bouncycastle.asn1.x509.KeyUsage;
+import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.bouncycastle.asn1.x509.X509Extensions;
+import org.bouncycastle.asn1.x509.X509Name;
+import org.bouncycastle.x509.X509V1CertificateGenerator;
+import org.bouncycastle.x509.X509V3CertificateGenerator;
+import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
+import org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -97,7 +97,7 @@ public class SslUtil {
       String name)
         throws GeneralSecurityException {
     java.security.Security.addProvider(
-        new com.android.org.bouncycastle.jce.provider.BouncyCastleProvider());
+        new org.bouncycastle.jce.provider.BouncyCastleProvider());
 
     Calendar calendar = Calendar.getInstance();
     calendar.set(2009, 0, 1);
@@ -140,7 +140,7 @@ public class SslUtil {
       String name, Date notBefore, Date notAfter, BigInteger serialNumber)
         throws GeneralSecurityException {
     java.security.Security.addProvider(
-        new com.android.org.bouncycastle.jce.provider.BouncyCastleProvider());
+        new org.bouncycastle.jce.provider.BouncyCastleProvider());
 
     X509V3CertificateGenerator certGen = new X509V3CertificateGenerator();
     X509Name dnName = new X509Name(name);