Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(592)

Side by Side Diff: net/socket/ssl_client_socket_nss.cc

Issue 3072003: Add a CHECK to help track down the crash in http://crbug.com/49862.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Upload before checkin. Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
6 // from AuthCertificateCallback() in 6 // from AuthCertificateCallback() in
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
8 8
9 /* ***** BEGIN LICENSE BLOCK ***** 9 /* ***** BEGIN LICENSE BLOCK *****
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 !received_renego_info) { 761 !received_renego_info) {
762 LOG(INFO) << "The server " << hostname_ 762 LOG(INFO) << "The server " << hostname_
763 << " does not support the TLS renegotiation_info extension."; 763 << " does not support the TLS renegotiation_info extension.";
764 } 764 }
765 #endif 765 #endif
766 } 766 }
767 767
768 void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { 768 void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) {
769 EnterFunction(""); 769 EnterFunction("");
770 ssl_info->Reset(); 770 ssl_info->Reset();
771 // A temporary CHECK for tracking down http://crbug.com/49862.
772 CHECK(server_cert_);
771 if (!server_cert_) 773 if (!server_cert_)
772 return; 774 return;
773 775
774 SSLChannelInfo channel_info; 776 SSLChannelInfo channel_info;
775 SECStatus ok = SSL_GetChannelInfo(nss_fd_, 777 SECStatus ok = SSL_GetChannelInfo(nss_fd_,
776 &channel_info, sizeof(channel_info)); 778 &channel_info, sizeof(channel_info));
777 if (ok == SECSuccess && 779 if (ok == SECSuccess &&
778 channel_info.length == sizeof(channel_info) && 780 channel_info.length == sizeof(channel_info) &&
779 channel_info.cipherSuite) { 781 channel_info.cipherSuite) {
780 SSLCipherSuiteInfo cipher_info; 782 SSLCipherSuiteInfo cipher_info;
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 PRErrorCode prerr = PR_GetError(); 1568 PRErrorCode prerr = PR_GetError();
1567 if (prerr == PR_WOULD_BLOCK_ERROR) { 1569 if (prerr == PR_WOULD_BLOCK_ERROR) {
1568 LeaveFunction(""); 1570 LeaveFunction("");
1569 return ERR_IO_PENDING; 1571 return ERR_IO_PENDING;
1570 } 1572 }
1571 LeaveFunction(""); 1573 LeaveFunction("");
1572 return MapNSPRError(prerr); 1574 return MapNSPRError(prerr);
1573 } 1575 }
1574 1576
1575 } // namespace net 1577 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698