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

Side by Side Diff: net/ssl/ssl_info.cc

Issue 1313363003: Expose OpenSSL's key_exchange_info in the content API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Proper #ifdef fix Created 5 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
« no previous file with comments | « net/ssl/ssl_info.h ('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/ssl/ssl_info.h" 5 #include "net/ssl/ssl_info.h"
6 6
7 #include "base/pickle.h" 7 #include "base/pickle.h"
8 #include "net/cert/cert_status_flags.h" 8 #include "net/cert/cert_status_flags.h"
9 #include "net/cert/signed_certificate_timestamp.h" 9 #include "net/cert/signed_certificate_timestamp.h"
10 #include "net/cert/x509_certificate.h" 10 #include "net/cert/x509_certificate.h"
11 11
12 namespace net { 12 namespace net {
13 13
14 SSLInfo::SSLInfo() { 14 SSLInfo::SSLInfo() {
15 Reset(); 15 Reset();
16 } 16 }
17 17
18 SSLInfo::SSLInfo(const SSLInfo& info) { 18 SSLInfo::SSLInfo(const SSLInfo& info) {
19 *this = info; 19 *this = info;
20 } 20 }
21 21
22 SSLInfo::~SSLInfo() { 22 SSLInfo::~SSLInfo() {
23 } 23 }
24 24
25 SSLInfo& SSLInfo::operator=(const SSLInfo& info) { 25 SSLInfo& SSLInfo::operator=(const SSLInfo& info) {
26 cert = info.cert; 26 cert = info.cert;
27 unverified_cert = info.unverified_cert; 27 unverified_cert = info.unverified_cert;
28 cert_status = info.cert_status; 28 cert_status = info.cert_status;
29 security_bits = info.security_bits; 29 security_bits = info.security_bits;
30 key_exchange_info = info.key_exchange_info;
30 connection_status = info.connection_status; 31 connection_status = info.connection_status;
31 is_issued_by_known_root = info.is_issued_by_known_root; 32 is_issued_by_known_root = info.is_issued_by_known_root;
32 client_cert_sent = info.client_cert_sent; 33 client_cert_sent = info.client_cert_sent;
33 channel_id_sent = info.channel_id_sent; 34 channel_id_sent = info.channel_id_sent;
34 handshake_type = info.handshake_type; 35 handshake_type = info.handshake_type;
35 public_key_hashes = info.public_key_hashes; 36 public_key_hashes = info.public_key_hashes;
36 signed_certificate_timestamps = info.signed_certificate_timestamps; 37 signed_certificate_timestamps = info.signed_certificate_timestamps;
37 pinning_failure_log = info.pinning_failure_log; 38 pinning_failure_log = info.pinning_failure_log;
38 39
39 return *this; 40 return *this;
40 } 41 }
41 42
42 void SSLInfo::Reset() { 43 void SSLInfo::Reset() {
43 cert = NULL; 44 cert = NULL;
44 unverified_cert = NULL; 45 unverified_cert = NULL;
45 cert_status = 0; 46 cert_status = 0;
46 security_bits = -1; 47 security_bits = -1;
48 key_exchange_info = 0;
47 connection_status = 0; 49 connection_status = 0;
48 is_issued_by_known_root = false; 50 is_issued_by_known_root = false;
49 client_cert_sent = false; 51 client_cert_sent = false;
50 channel_id_sent = false; 52 channel_id_sent = false;
51 handshake_type = HANDSHAKE_UNKNOWN; 53 handshake_type = HANDSHAKE_UNKNOWN;
52 public_key_hashes.clear(); 54 public_key_hashes.clear();
53 signed_certificate_timestamps.clear(); 55 signed_certificate_timestamps.clear();
54 pinning_failure_log.clear(); 56 pinning_failure_log.clear();
55 } 57 }
56 58
57 void SSLInfo::SetCertError(int error) { 59 void SSLInfo::SetCertError(int error) {
58 cert_status |= MapNetErrorToCertStatus(error); 60 cert_status |= MapNetErrorToCertStatus(error);
59 } 61 }
60 62
61 } // namespace net 63 } // namespace net
OLDNEW
« no previous file with comments | « net/ssl/ssl_info.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698