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

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

Issue 10855168: Rename X509Certificate::VerifyFlags to CertVerifier::VerifyFlags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One missed mac define Created 8 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
« no previous file with comments | « net/socket/ssl_client_socket_openssl.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "net/socket/ssl_client_socket_win.h" 5 #include "net/socket/ssl_client_socket_win.h"
6 6
7 #include <schnlsp.h> 7 #include <schnlsp.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1187 if (ssl_config_.IsAllowedBadCert(server_cert_, &cert_status)) { 1187 if (ssl_config_.IsAllowedBadCert(server_cert_, &cert_status)) {
1188 VLOG(1) << "Received an expected bad cert with status: " << cert_status; 1188 VLOG(1) << "Received an expected bad cert with status: " << cert_status;
1189 server_cert_verify_result_.Reset(); 1189 server_cert_verify_result_.Reset();
1190 server_cert_verify_result_.cert_status = cert_status; 1190 server_cert_verify_result_.cert_status = cert_status;
1191 server_cert_verify_result_.verified_cert = server_cert_; 1191 server_cert_verify_result_.verified_cert = server_cert_;
1192 return OK; 1192 return OK;
1193 } 1193 }
1194 1194
1195 int flags = 0; 1195 int flags = 0;
1196 if (ssl_config_.rev_checking_enabled) 1196 if (ssl_config_.rev_checking_enabled)
1197 flags |= X509Certificate::VERIFY_REV_CHECKING_ENABLED; 1197 flags |= CertVerifier::VERIFY_REV_CHECKING_ENABLED;
1198 if (ssl_config_.verify_ev_cert) 1198 if (ssl_config_.verify_ev_cert)
1199 flags |= X509Certificate::VERIFY_EV_CERT; 1199 flags |= CertVerifier::VERIFY_EV_CERT;
1200 if (ssl_config_.cert_io_enabled) 1200 if (ssl_config_.cert_io_enabled)
1201 flags |= X509Certificate::VERIFY_CERT_IO_ENABLED; 1201 flags |= CertVerifier::VERIFY_CERT_IO_ENABLED;
1202 verifier_.reset(new SingleRequestCertVerifier(cert_verifier_)); 1202 verifier_.reset(new SingleRequestCertVerifier(cert_verifier_));
1203 return verifier_->Verify( 1203 return verifier_->Verify(
1204 server_cert_, host_and_port_.host(), flags, 1204 server_cert_, host_and_port_.host(), flags,
1205 NULL /* no CRL set */, 1205 NULL /* no CRL set */,
1206 &server_cert_verify_result_, 1206 &server_cert_verify_result_,
1207 base::Bind(&SSLClientSocketWin::OnHandshakeIOComplete, 1207 base::Bind(&SSLClientSocketWin::OnHandshakeIOComplete,
1208 base::Unretained(this)), 1208 base::Unretained(this)),
1209 net_log_); 1209 net_log_);
1210 } 1210 }
1211 1211
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
1610 UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA); 1610 UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA);
1611 } 1611 }
1612 1612
1613 void SSLClientSocketWin::FreeSendBuffer() { 1613 void SSLClientSocketWin::FreeSendBuffer() {
1614 SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer); 1614 SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer);
1615 DCHECK(status == SEC_E_OK); 1615 DCHECK(status == SEC_E_OK);
1616 memset(&send_buffer_, 0, sizeof(send_buffer_)); 1616 memset(&send_buffer_, 0, sizeof(send_buffer_));
1617 } 1617 }
1618 1618
1619 } // namespace net 1619 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698