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

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

Issue 1174073003: Add served cert chain to SSLInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rsleevi nits Created 5 years, 6 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
« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/socket/ssl_client_socket_unittest.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 <errno.h> 10 #include <errno.h>
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 NOTREACHED(); 588 NOTREACHED();
589 return false; 589 return false;
590 } 590 }
591 591
592 bool SSLClientSocketOpenSSL::GetSSLInfo(SSLInfo* ssl_info) { 592 bool SSLClientSocketOpenSSL::GetSSLInfo(SSLInfo* ssl_info) {
593 ssl_info->Reset(); 593 ssl_info->Reset();
594 if (server_cert_chain_->empty()) 594 if (server_cert_chain_->empty())
595 return false; 595 return false;
596 596
597 ssl_info->cert = server_cert_verify_result_.verified_cert; 597 ssl_info->cert = server_cert_verify_result_.verified_cert;
598 ssl_info->unverified_cert = server_cert_;
598 ssl_info->cert_status = server_cert_verify_result_.cert_status; 599 ssl_info->cert_status = server_cert_verify_result_.cert_status;
599 ssl_info->is_issued_by_known_root = 600 ssl_info->is_issued_by_known_root =
600 server_cert_verify_result_.is_issued_by_known_root; 601 server_cert_verify_result_.is_issued_by_known_root;
601 ssl_info->public_key_hashes = 602 ssl_info->public_key_hashes =
602 server_cert_verify_result_.public_key_hashes; 603 server_cert_verify_result_.public_key_hashes;
603 ssl_info->client_cert_sent = 604 ssl_info->client_cert_sent =
604 ssl_config_.send_client_cert && ssl_config_.client_cert.get(); 605 ssl_config_.send_client_cert && ssl_config_.client_cert.get();
605 ssl_info->channel_id_sent = channel_id_sent_; 606 ssl_info->channel_id_sent = channel_id_sent_;
606 ssl_info->pinning_failure_log = pinning_failure_log_; 607 ssl_info->pinning_failure_log = pinning_failure_log_;
607 608
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1915 return ssl_config_.renego_allowed_default; 1916 return ssl_config_.renego_allowed_default;
1916 1917
1917 NextProto next_proto = NextProtoFromString(npn_proto_); 1918 NextProto next_proto = NextProtoFromString(npn_proto_);
1918 for (NextProto allowed : ssl_config_.renego_allowed_for_protos) { 1919 for (NextProto allowed : ssl_config_.renego_allowed_for_protos) {
1919 if (next_proto == allowed) 1920 if (next_proto == allowed)
1920 return true; 1921 return true;
1921 } 1922 }
1922 return false; 1923 return false;
1923 } 1924 }
1924 1925
1925 scoped_refptr<X509Certificate>
1926 SSLClientSocketOpenSSL::GetUnverifiedServerCertificateChain() const {
1927 return server_cert_;
1928 }
1929
1930 } // namespace net 1926 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698