Fix a typo IsCertStatusError. It should be IsCertificateError....

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/singleton.h"
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 74 matching lines @@
 // forward the result can be treated as a length.
 
 namespace net {
 
 namespace {
 
 int NetErrorFromOSStatus(OSStatus status) {
   switch (status) {
     case errSSLWouldBlock:
       return ERR_IO_PENDING;
-    case errSSLIllegalParam:
     case errSSLBadCipherSuite:
     case errSSLBadConfiguration:
       return ERR_INVALID_ARGUMENT;
     case errSSLClosedNoNotify:
       return ERR_CONNECTION_RESET;
     case errSSLConnectionRefused:
       return ERR_CONNECTION_REFUSED;
     case errSSLClosedAbort:
       return ERR_CONNECTION_ABORTED;
     case errSSLInternal:
     case errSSLCrypto:
     case errSSLFatalAlert:
+    case errSSLIllegalParam:  // Received an illegal_parameter alert.
+    case errSSLPeerUnexpectedMsg:  // Received an unexpected_message alert.
     case errSSLProtocol:
       return ERR_SSL_PROTOCOL_ERROR;
     case errSSLHostNameMismatch:
       return ERR_CERT_COMMON_NAME_INVALID;
     case errSSLCertExpired:
     case errSSLCertNotYetValid:
       return ERR_CERT_DATE_INVALID;
     case errSSLNoRootCert:
     case errSSLUnknownRootCert:
       return ERR_CERT_AUTHORITY_INVALID;
@@ skipping 121 matching lines @@
     default:
       return -1;
   }
 }
 
 // Returns the server's certificate.  The caller must release a reference
 // to the return value when done.  Returns NULL on failure.
 X509Certificate* GetServerCert(SSLContextRef ssl_context) {
   CFArrayRef certs;
   OSStatus status = SSLCopyPeerCertificates(ssl_context, &certs);
-  if (status != noErr)
+  // SSLCopyPeerCertificates may succeed but return a null |certs|.
+  if (status != noErr || !certs)
     return NULL;
 
   DCHECK_GT(CFArrayGetCount(certs), 0);
 
   SecCertificateRef server_cert = static_cast<SecCertificateRef>(
       const_cast<void*>(CFArrayGetValueAtIndex(certs, 0)));
   CFRetain(server_cert);
   CFRelease(certs);
   return X509Certificate::CreateFromHandle(
       server_cert, X509Certificate::SOURCE_FROM_NETWORK);
@@ skipping 262 matching lines @@
       server_cert_status_ |= CERT_STATUS_INVALID;
 
       for (size_t i = 0; i < ssl_config_.allowed_bad_certs.size(); ++i) {
         if (server_cert_ == ssl_config_.allowed_bad_certs[i].cert) {
           net_error = OK;
           server_cert_status_ = ssl_config_.allowed_bad_certs[i].cert_status;
           break;
         }
       }
     }
-  } else if (IsCertStatusError(net_error)) {
+  } else if (IsCertificateError(net_error)) {
     server_cert_ = GetServerCert(ssl_context_);
     DCHECK(server_cert_);
     server_cert_status_ |= MapNetErrorToCertStatus(net_error);
   }
 
   return net_error;
 }
 
 int SSLClientSocketMac::DoReadComplete(int result) {
   if (result < 0) {
@@ skipping 256 matching lines @@
 
   if (rv < 0 && rv != ERR_IO_PENDING) {
     return OSStatusFromNetError(rv);
   }
 
   // always lie to our caller
   return noErr;
 }
 
 }  // namespace net