Handle unexpected connection close during SSL handshake on Mac

net/socket/ssl_client_socket_mac.cc

 // Copyright (c) 2008-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/ssl_client_socket_mac.h"
 
 #include "base/scoped_cftyperef.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "net/base/cert_verifier.h"
@@ skipping 692 matching lines @@
     next_handshake_state_ = STATE_VERIFY_CERT;
     if (status == errSSLServerAuthCompletedFlag) {
       // Override errSSLServerAuthCompletedFlag as it's not actually an error,
       // but rather an indication that we're only half way through the
       // handshake.
       handshake_interrupted_ = true;
       status = noErr;
     }
   }
 
+  if (status == errSSLClosedGraceful)
+    // The server unexpectedly closed on us.
+    return ERR_UNEXPECTED;

[wtc, 2009/12/16 00:48:52]

Please add curly braces {} to this if statement because
with the comment the if body has two lines.

Please use ERR_SSL_PROTOCOL_ERROR instead of ERR_UNEXPECTED.
ERR_UNEXPECTED means the unexpected error is our own fault
(i.e., a programming error).  So, if a server behaves
unexpectedly, it is the server's fault, and we have to
handle any unexpected external input properly.

+
   int net_error = NetErrorFromOSStatus(status);
   if (status == noErr || IsCertificateError(net_error)) {
     server_cert_ = GetServerCert(ssl_context_);
     if (!server_cert_)
       return ERR_UNEXPECTED;
   }
   return net_error;
 }
 
 int SSLClientSocketMac::DoVerifyCert() {
@@ skipping 35 matching lines @@
 
   return result;
 }
 
 int SSLClientSocketMac::DoHandshakeFinish() {
   OSStatus status = SSLHandshake(ssl_context_);
 
   if (status == errSSLWouldBlock)
     next_handshake_state_ = STATE_HANDSHAKE_FINISH;
 
+  if (status == errSSLClosedGraceful)
+    return ERR_UNEXPECTED;

[wtc, 2009/12/16 00:48:52]

Same here: please use ERR_SSL_PROTOCOL_ERROR instead.

+
   if (status == noErr) {
     completed_handshake_ = true;
     DCHECK(next_handshake_state_ == STATE_NONE);
   }
 
   return NetErrorFromOSStatus(status);
 }
 
 int SSLClientSocketMac::DoPayloadRead() {
   size_t processed = 0;
@@ skipping 131 matching lines @@
   if (rv < 0 && rv != ERR_IO_PENDING) {
     us->write_io_buf_ = NULL;
     return OSStatusFromNetError(rv);
   }
 
   // always lie to our caller
   return noErr;
 }
 
 }  // namespace net