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

Merge "Track change to Conscrypt"

Browse Source
This commit is contained in:
Kenny Root
2014-11-03 18:34:00 +00:00
committed by Gerrit Code Review
parent 5f8099ed18 8a97063720
commit b0cb07348e
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

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

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

@@ -80,7 +80,7 @@ public class HttpsConnection extends Connection {
cache = FileClientSessionCache.usingDirectory(sessionDir); cache = FileClientSessionCache.usingDirectory(sessionDir);
} }
OpenSSLContextImpl sslContext = new OpenSSLContextImpl(); OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();
// here, trust managers is a single trust-all manager // here, trust managers is a single trust-all manager
TrustManager[] trustManagers = new TrustManager[] { 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, public void testClientSessionCaching() throws IOException,
KeyManagementException { KeyManagementException {
OpenSSLContextImpl context = new OpenSSLContextImpl(); OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred();
// Cache size = 2. // Cache size = 2.
FakeClientSessionCache fakeCache = new FakeClientSessionCache(); FakeClientSessionCache fakeCache = new FakeClientSessionCache();
@@ -1000,7 +1000,7 @@ public class SSLSocketTest extends TestCase {
public void testFileBasedClientSessionCache() throws IOException, public void testFileBasedClientSessionCache() throws IOException,
KeyManagementException { KeyManagementException {
OpenSSLContextImpl context = new OpenSSLContextImpl(); OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred();
String tmpDir = System.getProperty("java.io.tmpdir"); String tmpDir = System.getProperty("java.io.tmpdir");
if (tmpDir == null) { if (tmpDir == null) {
fail("Please set 'java.io.tmpdir' system property."); fail("Please set 'java.io.tmpdir' system property.");