diff options
4 files changed, 20 insertions, 13 deletions
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 9166019..a6d9c91 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -211,7 +211,8 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { private SSLSocketFactory makeSocketFactory(TrustManager[] trustManagers) { try { OpenSSLContextImpl sslContext = new OpenSSLContextImpl(); - sslContext.engineInit(null, trustManagers, null, mSessionCache, null); + sslContext.engineInit(null, trustManagers, null); + sslContext.engineGetClientSessionContext().setPersistentCache(mSessionCache); return sslContext.engineGetSocketFactory(); } catch (KeyManagementException e) { Log.wtf(TAG, e); diff --git a/core/java/android/net/http/HttpsConnection.java b/core/java/android/net/http/HttpsConnection.java index 8c9d013f..b361dca 100644 --- a/core/java/android/net/http/HttpsConnection.java +++ b/core/java/android/net/http/HttpsConnection.java @@ -98,7 +98,8 @@ public class HttpsConnection extends Connection { } }; - sslContext.engineInit(null, trustManagers, null, cache, null); + sslContext.engineInit(null, trustManagers, null); + sslContext.engineGetClientSessionContext().setPersistentCache(cache); synchronized (HttpsConnection.class) { mSslSocketFactory = sslContext.engineGetSocketFactory(); diff --git a/tests/CoreTests/android/core/SSLPerformanceTest.java b/tests/CoreTests/android/core/SSLPerformanceTest.java index fd87e89..5b5be0a 100644 --- a/tests/CoreTests/android/core/SSLPerformanceTest.java +++ b/tests/CoreTests/android/core/SSLPerformanceTest.java @@ -211,17 +211,17 @@ public class SSLPerformanceTest extends AndroidTestCase { deleteDirectory(); OpenSSLContextImpl sslContext = new OpenSSLContextImpl(); - sslContext.engineInit(null, null, null, - FileClientSessionCache.usingDirectory(getCacheDirectory()), - null); + sslContext.engineInit(null, null, null); + sslContext.engineGetClientSessionContext().setPersistentCache( + FileClientSessionCache.usingDirectory(getCacheDirectory())); // Make sure www.google.com is in the cache. getVerisignDotCom(sslContext); // Re-initialize so we hit the file cache. - sslContext.engineInit(null, null, null, - FileClientSessionCache.usingDirectory(getCacheDirectory()), - null); + sslContext.engineInit(null, null, null); + sslContext.engineGetClientSessionContext().setPersistentCache( + FileClientSessionCache.usingDirectory(getCacheDirectory())); Stopwatch stopwatch = new Stopwatch(); diff --git a/tests/CoreTests/android/core/SSLSocketTest.java b/tests/CoreTests/android/core/SSLSocketTest.java index 021df80..03905e1 100644 --- a/tests/CoreTests/android/core/SSLSocketTest.java +++ b/tests/CoreTests/android/core/SSLSocketTest.java @@ -911,7 +911,8 @@ public class SSLSocketTest extends TestCase { // Cache size = 2. FakeClientSessionCache fakeCache = new FakeClientSessionCache(); - context.engineInit(null, null, null, fakeCache, null); + context.engineInit(null, null, null); + context.engineGetClientSessionContext().setPersistentCache(fakeCache); SSLSocketFactory socketFactory = context.engineGetSocketFactory(); context.engineGetClientSessionContext().setSessionCacheSize(2); makeRequests(socketFactory); @@ -933,7 +934,8 @@ public class SSLSocketTest extends TestCase { // Cache size = 3. fakeCache = new FakeClientSessionCache(); - context.engineInit(null, null, null, fakeCache, null); + context.engineInit(null, null, null); + context.engineGetClientSessionContext().setPersistentCache(fakeCache); socketFactory = context.engineGetSocketFactory(); context.engineGetClientSessionContext().setSessionCacheSize(3); makeRequests(socketFactory); @@ -952,7 +954,8 @@ public class SSLSocketTest extends TestCase { // Cache size = 4. fakeCache = new FakeClientSessionCache(); - context.engineInit(null, null, null, fakeCache, null); + context.engineInit(null, null, null); + context.engineGetClientSessionContext().setPersistentCache(fakeCache); socketFactory = context.engineGetSocketFactory(); context.engineGetClientSessionContext().setSessionCacheSize(4); makeRequests(socketFactory); @@ -1010,7 +1013,8 @@ public class SSLSocketTest extends TestCase { try { ClientSessionCacheProxy cacheProxy = new ClientSessionCacheProxy(fileCache); - context.engineInit(null, null, null, cacheProxy, null); + context.engineInit(null, null, null); + context.engineGetClientSessionContext().setPersistentCache(cacheProxy); SSLSocketFactory socketFactory = context.engineGetSocketFactory(); context.engineGetClientSessionContext().setSessionCacheSize(1); makeRequests(socketFactory); @@ -1033,7 +1037,8 @@ public class SSLSocketTest extends TestCase { // Try again now that file-based cache is populated. fileCache = FileClientSessionCache.usingDirectory(cacheDir); cacheProxy = new ClientSessionCacheProxy(fileCache); - context.engineInit(null, null, null, cacheProxy, null); + context.engineInit(null, null, null); + context.engineGetClientSessionContext().setPersistentCache(cacheProxy); socketFactory = context.engineGetSocketFactory(); context.engineGetClientSessionContext().setSessionCacheSize(1); makeRequests(socketFactory); |