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

Side by Side Diff: net/socket/ssl_client_socket_openssl.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_nss.cc ('k') | net/socket/ssl_client_socket_win.cc » ('j') | 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 // OpenSSL binding for SSLClientSocket. The class layout and general principle 5 // OpenSSL binding for SSLClientSocket. The class layout and general principle
6 // of operation is derived from SSLClientSocketNSS. 6 // of operation is derived from SSLClientSocketNSS.
7 7
8 #include "net/socket/ssl_client_socket_openssl.h" 8 #include "net/socket/ssl_client_socket_openssl.h"
9 9
10 #include <openssl/ssl.h> 10 #include <openssl/ssl.h>
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 if (ssl_config_.IsAllowedBadCert(server_cert_, &cert_status)) { 911 if (ssl_config_.IsAllowedBadCert(server_cert_, &cert_status)) {
912 VLOG(1) << "Received an expected bad cert with status: " << cert_status; 912 VLOG(1) << "Received an expected bad cert with status: " << cert_status;
913 server_cert_verify_result_.Reset(); 913 server_cert_verify_result_.Reset();
914 server_cert_verify_result_.cert_status = cert_status; 914 server_cert_verify_result_.cert_status = cert_status;
915 server_cert_verify_result_.verified_cert = server_cert_; 915 server_cert_verify_result_.verified_cert = server_cert_;
916 return OK; 916 return OK;
917 } 917 }
918 918
919 int flags = 0; 919 int flags = 0;
920 if (ssl_config_.rev_checking_enabled) 920 if (ssl_config_.rev_checking_enabled)
921 flags |= X509Certificate::VERIFY_REV_CHECKING_ENABLED; 921 flags |= CertVerifier::VERIFY_REV_CHECKING_ENABLED;
922 if (ssl_config_.verify_ev_cert) 922 if (ssl_config_.verify_ev_cert)
923 flags |= X509Certificate::VERIFY_EV_CERT; 923 flags |= CertVerifier::VERIFY_EV_CERT;
924 if (ssl_config_.cert_io_enabled) 924 if (ssl_config_.cert_io_enabled)
925 flags |= X509Certificate::VERIFY_CERT_IO_ENABLED; 925 flags |= CertVerifier::VERIFY_CERT_IO_ENABLED;
926 verifier_.reset(new SingleRequestCertVerifier(cert_verifier_)); 926 verifier_.reset(new SingleRequestCertVerifier(cert_verifier_));
927 return verifier_->Verify( 927 return verifier_->Verify(
928 server_cert_, host_and_port_.host(), flags, 928 server_cert_, host_and_port_.host(), flags,
929 NULL /* no CRL set */, 929 NULL /* no CRL set */,
930 &server_cert_verify_result_, 930 &server_cert_verify_result_,
931 base::Bind(&SSLClientSocketOpenSSL::OnHandshakeIOComplete, 931 base::Bind(&SSLClientSocketOpenSSL::OnHandshakeIOComplete,
932 base::Unretained(this)), 932 base::Unretained(this)),
933 net_log_); 933 net_log_);
934 } 934 }
935 935
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv, 1318 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
1319 user_write_buf_->data()); 1319 user_write_buf_->data());
1320 return rv; 1320 return rv;
1321 } 1321 }
1322 1322
1323 int err = SSL_get_error(ssl_, rv); 1323 int err = SSL_get_error(ssl_, rv);
1324 return MapOpenSSLError(err, err_tracer); 1324 return MapOpenSSLError(err, err_tracer);
1325 } 1325 }
1326 1326
1327 } // namespace net 1327 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698