Fix some crashes by handling an NSS result value more carefully and reverting

net/base/ssl_client_socket_nss.cc

 // Copyright (c) 2006-2008 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/base/ssl_client_socket_nss.h"
 
 #include <nspr.h>
 #include <nss.h>
 #include <secerr.h>
 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
 // until NSS 3.12.2 comes out and we update to it.
 #define Lock FOO_NSS_Lock
 #include <ssl.h>
 #include <sslerr.h>
 #include <pk11pub.h>
 #undef Lock
 
 #include "base/logging.h"
 #include "base/nss_init.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"
 
 static const int kRecvBufferSize = 4096;
 
-// nss calls this if an incoming certificate is invalid.
-static SECStatus ownBadCertHandler(void* arg, PRFileDesc* socket) {
+namespace {
+
+// NSS calls this if an incoming certificate is invalid.
+SECStatus OwnBadCertHandler(void* arg, PRFileDesc* socket) {
   PRErrorCode err = PR_GetError();
   LOG(INFO) << "server certificate is invalid; NSS error code " << err;
   // Return SECSuccess to override the problem,
   // or SECFailure to let the original function fail
   // Chromium wants it to fail here, and may retry it later.
-  return SECFailure;
+  LOG(WARNING) << "TODO(dkegel): return SECFailure here";
+  return SECSuccess;
 }
 
+}  // anonymous namespace
 
 namespace net {
 
 // State machines are easier to debug if you log state transitions.
 // Enable these if you want to see what's going on.
 #if 1
 #define EnterFunction(x)
 #define LeaveFunction(x)
 #define GotoState(s) next_state_ = s
 #define LogData(s, len)
@@ skipping 196 matching lines @@
   LeaveFunction(rv);
   return rv;
 }
 
 void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) {
   EnterFunction("");
   ssl_info->Reset();
   SSLChannelInfo channel_info;
   SECStatus ok = SSL_GetChannelInfo(nss_fd_,
                                     &channel_info, sizeof(channel_info));
-  if (ok == SECSuccess) {
+  if (ok == SECSuccess &&
+      channel_info.length == sizeof(channel_info) &&
+      channel_info.cipherSuite) {
     SSLCipherSuiteInfo cipher_info;
     ok = SSL_GetCipherSuiteInfo(channel_info.cipherSuite,
                                 &cipher_info, sizeof(cipher_info));
     if (ok == SECSuccess) {
       ssl_info->security_bits = cipher_info.effectiveKeyBits;
     } else {
       ssl_info->security_bits = -1;
-      NOTREACHED();
+      LOG(DFATAL) << "SSL_GetCipherSuiteInfo returned " << PR_GetError()
+                  << " for cipherSuite " << channel_info.cipherSuite;
     }
   }
   ssl_info->cert_status = server_cert_status_;
   // TODO(port): implement X509Certificate so we can set the cert field!
   // CERTCertificate *nssCert = SSL_PeerCertificate(nss_fd_);
   LeaveFunction("");
 }
 
 void SSLClientSocketNSS::DoCallback(int rv) {
   EnterFunction(rv);
@@ skipping 219 matching lines @@
   if (rv != SECSuccess)
      LOG(INFO) << "SSL_ENABLE_SESSION_TICKETS failed.  Old system nss?";
 #else
   #error "You need to install NSS-3.12 or later to build chromium"
 #endif
 
   rv = SSL_OptionSet(nss_fd_, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE);
   if (rv != SECSuccess)
      return ERR_UNEXPECTED;
 
-  rv = SSL_BadCertHook(nss_fd_, ownBadCertHandler, NULL);
+  rv = SSL_BadCertHook(nss_fd_, OwnBadCertHandler, NULL);
   if (rv != SECSuccess)
      return ERR_UNEXPECTED;
 
   // Tell SSL the hostname we're trying to connect to.
   SSL_SetURL(nss_fd_, hostname_.c_str());
 
   // Tell SSL we're a client; needed if not letting NSPR do socket I/O
   SSL_ResetHandshake(nss_fd_, 0);
   GotoState(STATE_HANDSHAKE_READ);
   // Return OK so DoLoop tries handshaking
@@ skipping 65 matching lines @@
     GotoState(STATE_PAYLOAD_WRITE);
     return ERR_IO_PENDING;
   }
   user_buf_ = NULL;
   LeaveFunction("");
   return NetErrorFromNSPRError(prerr);
 }
 
 }  // namespace net