ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Introduce an SSL handshake timeout value of 30 seconds." into ub-mail-master

Browse Source
This commit is contained in:
Anthony Lee 2014-02-13 19:15:42 +00:00 committed by Android (Google) Code Review
commit c165d9bd77
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
View File

@ -54,6 +54,9 @@ public class SSLUtils {
private static final boolean LOG_ENABLED = false; private static final boolean LOG_ENABLED = false;
private static final String TAG = "Email.Ssl"; private static final String TAG = "Email.Ssl";
// A 30 second SSL handshake should be more than enough.
private static final int SSL_HANDSHAKE_TIMEOUT = 30000;
/** /**
* A trust manager specific to a particular HostAuth. The first time a server certificate is * A trust manager specific to a particular HostAuth. The first time a server certificate is
* encountered for the HostAuth, its certificate is saved; subsequent checks determine whether * encountered for the HostAuth, its certificate is saved; subsequent checks determine whether
@ -144,7 +147,7 @@ public class SSLUtils {
HostAuth hostAuth, boolean insecure) { HostAuth hostAuth, boolean insecure) {
if (insecure) { if (insecure) {
SSLCertificateSocketFactory insecureFactory = (SSLCertificateSocketFactory) SSLCertificateSocketFactory insecureFactory = (SSLCertificateSocketFactory)
SSLCertificateSocketFactory.getInsecure(0, null); SSLCertificateSocketFactory.getInsecure(SSL_HANDSHAKE_TIMEOUT, null);
insecureFactory.setTrustManagers( insecureFactory.setTrustManagers(
new TrustManager[] { new TrustManager[] {
new SameCertificateCheckingTrustManager(context, hostAuth)}); new SameCertificateCheckingTrustManager(context, hostAuth)});
@ -152,7 +155,7 @@ public class SSLUtils {
} else { } else {
if (sSecureFactory == null) { if (sSecureFactory == null) {
sSecureFactory = (SSLCertificateSocketFactory) sSecureFactory = (SSLCertificateSocketFactory)
SSLCertificateSocketFactory.getDefault(0, null); SSLCertificateSocketFactory.getDefault(SSL_HANDSHAKE_TIMEOUT, null);
} }
return sSecureFactory; return sSecureFactory;
} }