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

Side by Side Diff: net/quic/crypto/crypto_handshake.h

Issue 1437023002: Landing Recent QUIC changes until 2015-11-09 20:32 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/quic/congestion_control/tcp_cubic_sender.h ('k') | net/quic/crypto/crypto_handshake.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef NET_QUIC_CRYPTO_CRYPTO_HANDSHAKE_H_ 5 #ifndef NET_QUIC_CRYPTO_CRYPTO_HANDSHAKE_H_
6 #define NET_QUIC_CRYPTO_CRYPTO_HANDSHAKE_H_ 6 #define NET_QUIC_CRYPTO_CRYPTO_HANDSHAKE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // sending a client hello. 122 // sending a client hello.
123 std::vector<std::string> cached_certs; 123 std::vector<std::string> cached_certs;
124 // client_key_exchange is used by clients to store the ephemeral KeyExchange 124 // client_key_exchange is used by clients to store the ephemeral KeyExchange
125 // for the connection. 125 // for the connection.
126 scoped_ptr<KeyExchange> client_key_exchange; 126 scoped_ptr<KeyExchange> client_key_exchange;
127 // channel_id is set by servers to a ChannelID key when the client correctly 127 // channel_id is set by servers to a ChannelID key when the client correctly
128 // proves possession of the corresponding private key. It consists of 32 128 // proves possession of the corresponding private key. It consists of 32
129 // bytes of x coordinate, followed by 32 bytes of y coordinate. Both values 129 // bytes of x coordinate, followed by 32 bytes of y coordinate. Both values
130 // are big-endian and the pair is a P-256 public key. 130 // are big-endian and the pair is a P-256 public key.
131 std::string channel_id; 131 std::string channel_id;
132 QuicTag token_binding_key_param;
132 133
133 // Used when generating proof signature when sending server config updates. 134 // Used when generating proof signature when sending server config updates.
134 bool x509_ecdsa_supported; 135 bool x509_ecdsa_supported;
135 bool x509_supported; 136 bool x509_supported;
136 137
137 // Used to generate cert chain when sending server config updates. 138 // Used to generate cert chain when sending server config updates.
138 std::string client_common_set_hashes; 139 std::string client_common_set_hashes;
139 std::string client_cached_cert_hashes; 140 std::string client_cached_cert_hashes;
140 141
141 // Default to false; set to true if the client indicates that it supports sct 142 // Default to false; set to true if the client indicates that it supports sct
(...skipping 30 matching lines...) Expand all
172 173
173 QuicCryptoConfig(); 174 QuicCryptoConfig();
174 ~QuicCryptoConfig(); 175 ~QuicCryptoConfig();
175 176
176 // Key exchange methods. The following two members' values correspond by 177 // Key exchange methods. The following two members' values correspond by
177 // index. 178 // index.
178 QuicTagVector kexs; 179 QuicTagVector kexs;
179 // Authenticated encryption with associated data (AEAD) algorithms. 180 // Authenticated encryption with associated data (AEAD) algorithms.
180 QuicTagVector aead; 181 QuicTagVector aead;
181 182
183 // Supported Token Binding key parameters that can be negotiated in the client
184 // hello.
185 QuicTagVector tb_key_params;
186
182 const CommonCertSets* common_cert_sets; 187 const CommonCertSets* common_cert_sets;
183 188
184 private: 189 private:
185 DISALLOW_COPY_AND_ASSIGN(QuicCryptoConfig); 190 DISALLOW_COPY_AND_ASSIGN(QuicCryptoConfig);
186 }; 191 };
187 192
188 } // namespace net 193 } // namespace net
189 194
190 #endif // NET_QUIC_CRYPTO_CRYPTO_HANDSHAKE_H_ 195 #endif // NET_QUIC_CRYPTO_CRYPTO_HANDSHAKE_H_
OLDNEW
« no previous file with comments | « net/quic/congestion_control/tcp_cubic_sender.h ('k') | net/quic/crypto/crypto_handshake.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698