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

Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev

Browse Source
This commit is contained in:
Geremy Condra
2012-09-14 17:07:33 -07:00
committed by Android (Google) Code Review
parent 1c9894aa7f f743e54f2d
commit 74a550fac7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/http/CertificateChainValidator.java
View File

@@ -168,7 +168,13 @@ public class CertificateChainValidator {
}
try {
SSLParametersImpl.getDefaultTrustManager().checkServerTrusted(chain, authType);
X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager();
if (x509TrustManager instanceof TrustManagerImpl) {
TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager;
trustManager.checkServerTrusted(chain, authType, domain);
} else {
x509TrustManager.checkServerTrusted(chain, authType);
}
return null; // No errors.
} catch (GeneralSecurityException e) {
if (HttpLog.LOGV) {