diff options
| -rw-r--r-- | emailcommon/Android.mk | 2 | ||||
| -rw-r--r-- | emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/emailcommon/Android.mk b/emailcommon/Android.mk index 654e20d60..14ea55078 100644 --- a/emailcommon/Android.mk +++ b/emailcommon/Android.mk @@ -42,7 +42,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, $(apache_src_dir)) LOCAL_SRC_FILES += $(imported_unified_email_files) LOCAL_SRC_FILES += $(call all-java-files-under, $(unified_email_src_dir)/com/android/emailcommon) -LOCAL_SDK_VERSION := 14 +LOCAL_SDK_VERSION := 17 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java b/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java index b7a59b81d..4d19e158c 100644 --- a/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java +++ b/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java @@ -33,6 +33,8 @@ package com.android.emailcommon.utility; +import com.android.mail.utils.LogUtils; + import org.apache.http.conn.scheme.HostNameResolver; import org.apache.http.conn.scheme.LayeredSocketFactory; import org.apache.http.conn.ssl.AllowAllHostnameVerifier; @@ -49,7 +51,10 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; + import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; @@ -144,6 +149,9 @@ import java.security.UnrecoverableKeyException; public class SSLSocketFactory implements LayeredSocketFactory { + private static final boolean LOG_ENABLED = false; + private static final String TAG = "Email.SslFactory"; + public static final String TLS = "TLS"; public static final String SSL = "SSL"; public static final String SSLV2 = "SSLv2"; @@ -323,6 +331,10 @@ public class SSLSocketFactory implements LayeredSocketFactory { sslsock.connect(remoteAddress, connTimeout); sslsock.setSoTimeout(soTimeout); + + // Set Server Name Indication if is available for this socket + setSocketHostname(sslsock, host); + try { hostnameVerifier.verify(host, sslsock); // verifyHostName() didn't blowup - good! @@ -386,6 +398,10 @@ public class SSLSocketFactory implements LayeredSocketFactory { port, autoClose ); + + // Set Server Name Indication if it's available for this socket + setSocketHostname(sslSocket, host); + hostnameVerifier.verify(host, sslSocket); // verifyHostName() didn't blowup - good! return sslSocket; @@ -402,4 +418,21 @@ public class SSLSocketFactory implements LayeredSocketFactory { return hostnameVerifier; } + private void setSocketHostname(SSLSocket sslSocket, String hostname) { + try { + Method method = sslSocket.getClass().getMethod("setHostname", String.class); + method.invoke(sslSocket, hostname); + return; + } catch (NoSuchMethodException ex) { + // Ignore + } catch (InvocationTargetException ex) { + // Ignore + } catch (IllegalAccessException ex) { + // Ignore + } + if (LOG_ENABLED) { + LogUtils.i(TAG, "setHostname isn't available for this socket."); + } + } + } |