Changed catch-all Mac SSL OSStatus error to paramErr

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 <CoreServices/CoreServices.h>
+
 #include "base/scoped_cftyperef.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_log.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"
 
 // Welcome to Mac SSL. We've been waiting for you.
@@ skipping 94 matching lines @@
     case errSSLWouldBlock:
       return ERR_IO_PENDING;
     case errSSLBadCipherSuite:
     case errSSLBadConfiguration:
       return ERR_INVALID_ARGUMENT;
     case errSSLClosedNoNotify:
       return ERR_CONNECTION_RESET;
     case errSSLClosedAbort:
       return ERR_CONNECTION_ABORTED;
     case errSSLInternal:
+      return ERR_UNEXPECTED;
     case errSSLCrypto:
     case errSSLFatalAlert:
     case errSSLIllegalParam:  // Received an illegal_parameter alert.
     case errSSLPeerUnexpectedMsg:  // Received an unexpected_message alert.
     case errSSLProtocol:
     case errSSLPeerHandshakeFail:  // Received a handshake_failure alert.
     case errSSLConnectionRefused:
       return ERR_SSL_PROTOCOL_ERROR;
     case errSSLHostNameMismatch:
       return ERR_CERT_COMMON_NAME_INVALID;
@@ skipping 32 matching lines @@
     case ERR_IO_PENDING:
       return errSSLWouldBlock;
     case ERR_INTERNET_DISCONNECTED:
     case ERR_TIMED_OUT:
     case ERR_CONNECTION_ABORTED:
     case ERR_CONNECTION_RESET:
     case ERR_CONNECTION_REFUSED:
     case ERR_ADDRESS_UNREACHABLE:
     case ERR_ADDRESS_INVALID:
       return errSSLClosedAbort;
+    case ERR_UNEXPECTED:
+      return errSSLInternal;
+    case ERR_INVALID_ARGUMENT:
+      return paramErr;
     case OK:
       return noErr;
     default:
       LOG(WARNING) << "Unknown error " << net_error <<
-          " mapped to errSSLIllegalParam";
-      return errSSLIllegalParam;
+          " mapped to paramErr";
+      return paramErr;
   }
 }
 
 // Converts from a cipher suite to its key size. If the suite is marked with a
 // **, it's not actually implemented in Secure Transport and won't be returned
 // (but we'll code for it anyway).  The reference here is
 // http://www.opensource.apple.com/darwinsource/10.5.5/libsecurity_ssl-32463/lib/cipherSpecs.c
 // Seriously, though, there has to be an API for this, but I can't find one.
 // Anybody?
 int KeySizeOfCipherSuite(SSLCipherSuite suite) {
@@ skipping 727 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