diff options
| author | Martin Hibdon <mhibdon@google.com> | 2014-10-24 19:34:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-24 19:34:10 +0000 |
| commit | 21dc44d235d902fa9eea0b3ce2c4bc5140fd8ba8 (patch) | |
| tree | ca8ee98353a70a3379e78b1b7c946bbea0d8796d /emailcommon | |
| parent | 303b553b13a02529fc8cb22b9b37672887759ce9 (diff) | |
| parent | 93a9662d8db14e492da0cf4866265a0ddebda190 (diff) | |
| download | android_packages_apps_Email-21dc44d235d902fa9eea0b3ce2c4bc5140fd8ba8.tar.gz android_packages_apps_Email-21dc44d235d902fa9eea0b3ce2c4bc5140fd8ba8.tar.bz2 android_packages_apps_Email-21dc44d235d902fa9eea0b3ce2c4bc5140fd8ba8.zip | |
Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev
Diffstat (limited to 'emailcommon')
| -rw-r--r-- | emailcommon/src/com/android/emailcommon/utility/SSLSocketFactoryWrapper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactoryWrapper.java b/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactoryWrapper.java index 516084fe4..66b596bff 100644 --- a/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactoryWrapper.java +++ b/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactoryWrapper.java @@ -234,10 +234,10 @@ public class SSLSocketFactoryWrapper extends javax.net.ssl.SSLSocketFactory { ssl.startHandshake(); SSLSession session = ssl.getSession(); - LogUtils.d(LogUtils.TAG, "using cipherSuite %s", session.getCipherSuite()); if (session == null) { throw new SSLException("Cannot verify SSL socket without session"); } + LogUtils.d(LogUtils.TAG, "using cipherSuite %s", session.getCipherSuite()); if (!HttpsURLConnection.getDefaultHostnameVerifier().verify(hostname, session)) { throw new SSLPeerUnverifiedException("Cannot verify hostname: " + hostname); } |