Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12e75222 authored by Kenny Root's avatar Kenny Root
Browse files

Track change to JSSE provider 

Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
parent 28b1f0ee

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ LOCAL_INTERMEDIATE_SOURCES := \ 
			$(framework_res_source_path)/com/android/internal/R.java



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext okhttp

LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt core core-junit ext okhttp



LOCAL_MODULE := framework

LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -400,6 +400,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ 


framework_docs_LOCAL_JAVA_LIBRARIES := \

			bouncycastle \

			conscrypt \

			core \

			okhttp \

			ext \

core/java/android/app/ActivityThread.java

+1 −2
Original line number Diff line number Diff line
@@ -92,8 +92,7 @@ import com.android.internal.os.BinderInternal; 
import com.android.internal.os.RuntimeInit;

import com.android.internal.os.SamplingProfilerIntegration;

import com.android.internal.util.Objects;



import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;

import com.android.org.conscrypt.OpenSSLSocketImpl;



import java.io.File;

import java.io.FileDescriptor;

core/java/android/net/SSLCertificateSocketFactory.java

+3 −3
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ package android.net; 


import android.os.SystemProperties;

import android.util.Log;

import com.android.org.conscrypt.OpenSSLContextImpl;

import com.android.org.conscrypt.OpenSSLSocketImpl;

import com.android.org.conscrypt.SSLClientSessionCache;

import java.io.IOException;

import java.net.InetAddress;

import java.net.Socket;
@@ -36,9 +39,6 @@ import javax.net.ssl.SSLSocket; 
import javax.net.ssl.SSLSocketFactory;

import javax.net.ssl.TrustManager;

import javax.net.ssl.X509TrustManager;

import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;

import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;

import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;



/**

 * SSLSocketFactory implementation with several extra features:

core/java/android/net/SSLSessionCache.java

+3 −3
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package android.net;



import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;

import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;



import android.content.Context;

import android.util.Log;



import com.android.org.conscrypt.FileClientSessionCache;

import com.android.org.conscrypt.SSLClientSessionCache;



import java.io.File;

import java.io.IOException;

core/java/android/net/http/CertificateChainValidator.java

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.net.http;



import com.android.org.conscrypt.SSLParametersImpl;

import com.android.org.conscrypt.TrustManagerImpl;



import java.io.ByteArrayInputStream;

import java.io.IOException;
@@ -30,8 +32,6 @@ import javax.net.ssl.SSLHandshakeException; 
import javax.net.ssl.SSLSession;

import javax.net.ssl.SSLSocket;

import javax.net.ssl.X509TrustManager;

import org.apache.harmony.xnet.provider.jsse.SSLParametersImpl;

import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;



/**

 * Class responsible for all server certificate validation functionality