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

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

Issue 7819009: For the SSL cert status, convert anonymous enum that gives bit values into a typedefed uint32. Th... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 } 814 }
815 DVLOG(2) << "next protocol: '" << npn_proto_ << "' status: " << npn_status_; 815 DVLOG(2) << "next protocol: '" << npn_proto_ << "' status: " << npn_status_;
816 #endif 816 #endif
817 return SSL_TLSEXT_ERR_OK; 817 return SSL_TLSEXT_ERR_OK;
818 } 818 }
819 819
820 int SSLClientSocketOpenSSL::DoVerifyCert(int result) { 820 int SSLClientSocketOpenSSL::DoVerifyCert(int result) {
821 DCHECK(server_cert_); 821 DCHECK(server_cert_);
822 GotoState(STATE_VERIFY_CERT_COMPLETE); 822 GotoState(STATE_VERIFY_CERT_COMPLETE);
823 823
824 int cert_status; 824 CertStatus cert_status;
825 if (ssl_config_.IsAllowedBadCert(server_cert_, &cert_status)) { 825 if (ssl_config_.IsAllowedBadCert(server_cert_, &cert_status)) {
826 VLOG(1) << "Received an expected bad cert with status: " << cert_status; 826 VLOG(1) << "Received an expected bad cert with status: " << cert_status;
827 server_cert_verify_result_.Reset(); 827 server_cert_verify_result_.Reset();
828 server_cert_verify_result_.cert_status = cert_status; 828 server_cert_verify_result_.cert_status = cert_status;
829 server_cert_verify_result_.verified_cert = server_cert_; 829 server_cert_verify_result_.verified_cert = server_cert_;
830 return OK; 830 return OK;
831 } 831 }
832 832
833 int flags = 0; 833 int flags = 0;
834 if (ssl_config_.rev_checking_enabled) 834 if (ssl_config_.rev_checking_enabled)
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv, 1216 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
1217 user_write_buf_->data()); 1217 user_write_buf_->data());
1218 return rv; 1218 return rv;
1219 } 1219 }
1220 1220
1221 int err = SSL_get_error(ssl_, rv); 1221 int err = SSL_get_error(ssl_, rv);
1222 return MapOpenSSLError(err, err_tracer); 1222 return MapOpenSSLError(err, err_tracer);
1223 } 1223 }
1224 1224
1225 } // namespace net 1225 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698