Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove explicit SSLSocket.startHandshake"

Browse Source
This commit is contained in:
Brian Carlstrom
2010-05-05 10:47:13 -07:00
committed by Android (Google) Code Review
parent fe66eef15c e103355d93
commit a4252e8351
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/net/http/CertificateChainValidator.java
View File

@@ -80,14 +80,10 @@ class CertificateChainValidator {
throws IOException {
X509Certificate[] serverCertificates = null;
// start handshake, close the socket if we fail
try {
sslSocket.setUseClientMode(true);
sslSocket.startHandshake();
} catch (IOException e) {
closeSocketThrowException(
sslSocket, e.getMessage(),
"failed to perform SSL handshake");
// get a valid SSLSession, close the socket if we fail
SSLSession sslSession = sslSession = sslSocket.getSession();
if (!sslSession.isValid()) {
closeSocketThrowException(sslSocket, "failed to perform SSL handshake");
}
// retrieve the chain of the server peer certificates