Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

Browse Source 
This reverts commit 693ea60e9e.

Bug: 19894176
Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b
This commit is contained in:
Kenny Root
2015-03-31 09:11:34 -07:00
parent 9eed9e962c
commit 9a7c1a3549
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/SSLCertificateSocketFactory.java
View File

@@ -208,7 +208,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
private SSLSocketFactory makeSocketFactory(
KeyManager[] keyManagers, TrustManager[] trustManagers) {
try {
OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();
OpenSSLContextImpl sslContext = new OpenSSLContextImpl();
sslContext.engineInit(keyManagers, trustManagers, null);
sslContext.engineGetClientSessionContext().setPersistentCache(mSessionCache);
return sslContext.engineGetSocketFactory();

2
core/java/android/net/http/HttpsConnection.java
View File

@@ -79,7 +79,7 @@ public class HttpsConnection extends Connection {
cache = FileClientSessionCache.usingDirectory(sessionDir);
}
OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();
OpenSSLContextImpl sslContext = new OpenSSLContextImpl();
// here, trust managers is a single trust-all manager
TrustManager[] trustManagers = new TrustManager[] {

4
tests/CoreTests/android/core/SSLSocketTest.java
View File

@@ -907,7 +907,7 @@ public class SSLSocketTest extends TestCase {
*/
public void testClientSessionCaching() throws IOException,
KeyManagementException {
OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred();
OpenSSLContextImpl context = new OpenSSLContextImpl();
// Cache size = 2.
FakeClientSessionCache fakeCache = new FakeClientSessionCache();
@@ -1000,7 +1000,7 @@ public class SSLSocketTest extends TestCase {
public void testFileBasedClientSessionCache() throws IOException,
KeyManagementException {
OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred();
OpenSSLContextImpl context = new OpenSSLContextImpl();
String tmpDir = System.getProperty("java.io.tmpdir");
if (tmpDir == null) {
fail("Please set 'java.io.tmpdir' system property.");