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

Commit e103355d authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Remove explicit SSLSocket.startHandshake 

    When dalvik-dev merges to master, startHandshake will imply that
    the caller wants a fully synchronous handshake instead of using
    handshake cutthrough. This removes an unnecessary startHandshake
    from the CertificateChainValidator.

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

Change-Id: Ie28abd961a06b28fa780d62b0063371ef4dc1eec
parent 5748ab3d

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