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

email: start handshake before hostname verification

Browse Source 
Start handshake prior to hostname verification to ensure exceptions do not get silenced

Change-Id: Ide60753663d82d63b0f410b985447b7b26efd8f1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
This commit is contained in:
Jorge Ruesga 2014-12-17 01:04:27 +01:00 committed by Steve Kondik
parent 761a860cee
commit a7d1b42409
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java
View File

@ -335,6 +335,10 @@ public class SSLSocketFactory implements LayeredSocketFactory {
// Set Server Name Indication if is available for this socket
setSocketHostname(sslsock, host);
// Start handshake prior to hostname verification to ensure
// handshake exceptions do not get silenced by hostname verification.
sslsock.startHandshake();
try {
hostnameVerifier.verify(host, sslsock);
// verifyHostName() didn't blowup - good!
@ -402,6 +406,10 @@ public class SSLSocketFactory implements LayeredSocketFactory {
// Set Server Name Indication if it's available for this socket
setSocketHostname(sslSocket, host);
// Start handshake prior to hostname verification to ensure
// handshake exceptions do not get silenced by hostname verification.
sslSocket.startHandshake();
hostnameVerifier.verify(host, sslSocket);
// verifyHostName() didn't blowup - good!
return sslSocket;