Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4252e83 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Remove explicit SSLSocket.startHandshake"

parents fe66eef1 e103355d

core/java/android/net/http/CertificateChainValidator.java

+4 −8
Original line number Diff line number Diff line
@@ -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