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

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

Issue 1360633002: Implement Token Binding negotiation TLS extension (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test-server-flags
Patch Set: rebase Created 5 years, 1 month 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"
(...skipping 14 matching lines...) Expand all
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 key_exchange_info = info.key_exchange_info;
31 connection_status = info.connection_status; 31 connection_status = info.connection_status;
32 is_issued_by_known_root = info.is_issued_by_known_root; 32 is_issued_by_known_root = info.is_issued_by_known_root;
33 client_cert_sent = info.client_cert_sent; 33 client_cert_sent = info.client_cert_sent;
34 channel_id_sent = info.channel_id_sent; 34 channel_id_sent = info.channel_id_sent;
35 token_binding_negotiated = info.token_binding_negotiated;
36 token_binding_key_param = info.token_binding_key_param;
35 handshake_type = info.handshake_type; 37 handshake_type = info.handshake_type;
36 public_key_hashes = info.public_key_hashes; 38 public_key_hashes = info.public_key_hashes;
37 signed_certificate_timestamps = info.signed_certificate_timestamps; 39 signed_certificate_timestamps = info.signed_certificate_timestamps;
38 pinning_failure_log = info.pinning_failure_log; 40 pinning_failure_log = info.pinning_failure_log;
39 41
40 return *this; 42 return *this;
41 } 43 }
42 44
43 void SSLInfo::Reset() { 45 void SSLInfo::Reset() {
44 cert = NULL; 46 cert = NULL;
45 unverified_cert = NULL; 47 unverified_cert = NULL;
46 cert_status = 0; 48 cert_status = 0;
47 security_bits = -1; 49 security_bits = -1;
48 key_exchange_info = 0; 50 key_exchange_info = 0;
49 connection_status = 0; 51 connection_status = 0;
50 is_issued_by_known_root = false; 52 is_issued_by_known_root = false;
51 client_cert_sent = false; 53 client_cert_sent = false;
52 channel_id_sent = false; 54 channel_id_sent = false;
55 token_binding_negotiated = false;
56 token_binding_key_param = TB_PARAM_ECDSAP256;
53 handshake_type = HANDSHAKE_UNKNOWN; 57 handshake_type = HANDSHAKE_UNKNOWN;
54 public_key_hashes.clear(); 58 public_key_hashes.clear();
55 signed_certificate_timestamps.clear(); 59 signed_certificate_timestamps.clear();
56 pinning_failure_log.clear(); 60 pinning_failure_log.clear();
57 } 61 }
58 62
59 void SSLInfo::SetCertError(int error) { 63 void SSLInfo::SetCertError(int error) {
60 cert_status |= MapNetErrorToCertStatus(error); 64 cert_status |= MapNetErrorToCertStatus(error);
61 } 65 }
62 66
63 } // namespace net 67 } // 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