From 7e65b1fc1dead5256f165d367af30b850e43aec6 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Wed, 12 Oct 2011 13:41:59 -0700
Subject: [PATCH] DO NOT MERGE: Fix hostname verifier for Exchange connections.

When the socketfactory init code was moved, I forgot to re-add in the check
to skip hostname verification. This made "Trust all SSL certificates"
checkbox useless.

Backported from: Ie4cba749aaf8c0fd9f9c43f09ebf354c6600d4f0
Bug: 5450563

Change-Id: Id1c80393d41068e6872ca5d42a3e5888805a3f09
---
 .../src/com/android/emailcommon/utility/SSLUtils.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
index aa5229aec..b21c68f33 100644
--- a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
+++ b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
@@ -74,7 +74,11 @@ public class SSLUtils {
         if (keyManager != null) {
             underlying.setKeyManagers(new KeyManager[] { keyManager });
         }
-        return new SSLSocketFactory(underlying);
+        SSLSocketFactory wrapped = new SSLSocketFactory(underlying);
+        if (insecure) {
+            wrapped.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+        }
+        return wrapped;
     }
 
     /**