diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-06-24 10:05:30 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-06-24 10:05:30 +0200 |
commit | 8874d58e68f251bb3a9367caa686e6ef08e55ce8 (patch) | |
tree | 193e0fdf930e4cc88ecb55f41bf42bad2440aeeb /src/main/java/de/pixart/messenger/http/HttpConnectionManager.java | |
parent | 356c7bec9c2900242b16d99968cdcd78e674dee9 (diff) |
also check for hostname in in certs if hostname is from trusted source
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/http/HttpConnectionManager.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java index 20213521f..340bc6d7a 100644 --- a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java +++ b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java @@ -58,19 +58,11 @@ public class HttpConnectionManager extends AbstractConnectionManager { public void setupTrustManager(final HttpsURLConnection connection, final boolean interactive) { final X509TrustManager trustManager; - final HostnameVerifier hostnameVerifier; + final HostnameVerifier hostnameVerifier = mXmppConnectionService.getMemorizingTrustManager().wrapHostnameVerifier(new StrictHostnameVerifier(), interactive); if (interactive) { trustManager = mXmppConnectionService.getMemorizingTrustManager().getInteractive(); - hostnameVerifier = mXmppConnectionService - .getMemorizingTrustManager().wrapHostnameVerifier( - new StrictHostnameVerifier()); } else { - trustManager = mXmppConnectionService.getMemorizingTrustManager() - .getNonInteractive(); - hostnameVerifier = mXmppConnectionService - .getMemorizingTrustManager() - .wrapHostnameVerifierNonInteractive( - new StrictHostnameVerifier()); + trustManager = mXmppConnectionService.getMemorizingTrustManager().getNonInteractive(); } try { final SSLSocketFactory sf = new TLSSocketFactory(new X509TrustManager[]{trustManager}, mXmppConnectionService.getRNG()); |