From 43e41580e4c700e970cc5e62180a767ab424da6d Mon Sep 17 00:00:00 2001 From: Selim Gurun Date: Wed, 15 Feb 2012 19:04:04 -0800 Subject: Revert "Act on credential storage updates." This reverts commit fcd93b72a3dde2b20fa0d8b04d3f47311b0856a1 --- .../java/android/net/http/CertificateChainValidator.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'core/java/android/net') diff --git a/core/java/android/net/http/CertificateChainValidator.java b/core/java/android/net/http/CertificateChainValidator.java index 06c6c6e..f94d320 100644 --- a/core/java/android/net/http/CertificateChainValidator.java +++ b/core/java/android/net/http/CertificateChainValidator.java @@ -25,17 +25,15 @@ import javax.net.ssl.DefaultHostnameVerifier; import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; -import javax.net.ssl.X509TrustManager; import org.apache.harmony.security.provider.cert.X509CertImpl; import org.apache.harmony.xnet.provider.jsse.SSLParametersImpl; -import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl; /** * Class responsible for all server certificate validation functionality * * {@hide} */ -public class CertificateChainValidator { +class CertificateChainValidator { /** * The singleton instance of the certificate chain validator @@ -124,18 +122,6 @@ public class CertificateChainValidator { } /** - * Handles updates to credential storage. - */ - public static void handleTrustStorageUpdate() { - - X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager(); - if( x509TrustManager instanceof TrustManagerImpl ) { - TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager; - trustManager.handleTrustStorageUpdate(); - } - } - - /** * Common code of doHandshakeAndValidateServerCertificates and verifyServerCertificates. * Calls DomainNamevalidator to verify the domain, and TrustManager to verify the certs. * @param chain the cert chain in X509 cert format. -- cgit v1.1