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

Side by Side Diff: net/quic/crypto/quic_crypto_server_config.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_QUIC_CRYPTO_SERVER_CONFIG_H_ 5 #ifndef NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
6 #define NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_ 6 #define NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 // ConfigOptions contains options for generating server configs. 118 // ConfigOptions contains options for generating server configs.
119 struct NET_EXPORT_PRIVATE ConfigOptions { 119 struct NET_EXPORT_PRIVATE ConfigOptions {
120 ConfigOptions(); 120 ConfigOptions();
121 121
122 // expiry_time is the time, in UNIX seconds, when the server config will 122 // expiry_time is the time, in UNIX seconds, when the server config will
123 // expire. If unset, it defaults to the current time plus six months. 123 // expire. If unset, it defaults to the current time plus six months.
124 QuicWallTime expiry_time; 124 QuicWallTime expiry_time;
125 // channel_id_enabled controls whether the server config will indicate 125 // channel_id_enabled controls whether the server config will indicate
126 // support for ChannelIDs. 126 // support for ChannelIDs.
127 bool channel_id_enabled; 127 bool channel_id_enabled;
128 // token_binding_enabled controls whether the server config will indicate
129 // support for Token Binding.
130 bool token_binding_enabled;
128 // id contains the server config id for the resulting config. If empty, a 131 // id contains the server config id for the resulting config. If empty, a
129 // random id is generated. 132 // random id is generated.
130 std::string id; 133 std::string id;
131 // orbit contains the kOrbitSize bytes of the orbit value for the server 134 // orbit contains the kOrbitSize bytes of the orbit value for the server
132 // config. If |orbit| is empty then a random orbit is generated. 135 // config. If |orbit| is empty then a random orbit is generated.
133 std::string orbit; 136 std::string orbit;
134 // p256 determines whether a P-256 public key will be included in the 137 // p256 determines whether a P-256 public key will be included in the
135 // server config. Note that this breaks deterministic server-config 138 // server config. Note that this breaks deterministic server-config
136 // generation since P-256 key generation doesn't use the QuicRandom given 139 // generation since P-256 key generation doesn't use the QuicRandom given
137 // to DefaultConfig(). 140 // to DefaultConfig().
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 604
602 // Enable serving SCT or not. 605 // Enable serving SCT or not.
603 bool enable_serving_sct_; 606 bool enable_serving_sct_;
604 607
605 DISALLOW_COPY_AND_ASSIGN(QuicCryptoServerConfig); 608 DISALLOW_COPY_AND_ASSIGN(QuicCryptoServerConfig);
606 }; 609 };
607 610
608 } // namespace net 611 } // namespace net
609 612
610 #endif // NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_ 613 #endif // NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
OLDNEW
« no previous file with comments | « net/quic/crypto/quic_crypto_client_config_test.cc ('k') | net/quic/crypto/quic_crypto_server_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698