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

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

Issue 3165057: Remove two CHECKs that were added to help track down the crash... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 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
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 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 !received_renego_info) { 810 !received_renego_info) {
811 LOG(INFO) << "The server " << hostname_ 811 LOG(INFO) << "The server " << hostname_
812 << " does not support the TLS renegotiation_info extension."; 812 << " does not support the TLS renegotiation_info extension.";
813 } 813 }
814 #endif 814 #endif
815 } 815 }
816 816
817 void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { 817 void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) {
818 EnterFunction(""); 818 EnterFunction("");
819 ssl_info->Reset(); 819 ssl_info->Reset();
820 // A temporary CHECK for tracking down http://crbug.com/49862.
821 CHECK(server_cert_);
822 if (!server_cert_) 820 if (!server_cert_)
823 return; 821 return;
824 822
825 SSLChannelInfo channel_info; 823 SSLChannelInfo channel_info;
826 SECStatus ok = SSL_GetChannelInfo(nss_fd_, 824 SECStatus ok = SSL_GetChannelInfo(nss_fd_,
827 &channel_info, sizeof(channel_info)); 825 &channel_info, sizeof(channel_info));
828 if (ok == SECSuccess && 826 if (ok == SECSuccess &&
829 channel_info.length == sizeof(channel_info) && 827 channel_info.length == sizeof(channel_info) &&
830 channel_info.cipherSuite) { 828 channel_info.cipherSuite) {
831 SSLCipherSuiteInfo cipher_info; 829 SSLCipherSuiteInfo cipher_info;
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 PRErrorCode prerr = PR_GetError(); 1691 PRErrorCode prerr = PR_GetError();
1694 if (prerr == PR_WOULD_BLOCK_ERROR) { 1692 if (prerr == PR_WOULD_BLOCK_ERROR) {
1695 LeaveFunction(""); 1693 LeaveFunction("");
1696 return ERR_IO_PENDING; 1694 return ERR_IO_PENDING;
1697 } 1695 }
1698 LeaveFunction(""); 1696 LeaveFunction("");
1699 return MapNSPRError(prerr); 1697 return MapNSPRError(prerr);
1700 } 1698 }
1701 1699
1702 } // namespace net 1700 } // namespace net
OLDNEW
« net/http/http_stream_request.cc ('K') | « net/http/http_stream_request.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698