| Index: net/quic/crypto/quic_crypto_server_config.h
|
| diff --git a/net/quic/crypto/quic_crypto_server_config.h b/net/quic/crypto/quic_crypto_server_config.h
|
| index feac8528f59a78607d1444eabd57158dc8c4f5cb..dea4e037c2e6dc5c4c605851e12634ce9f3fd6bc 100644
|
| --- a/net/quic/crypto/quic_crypto_server_config.h
|
| +++ b/net/quic/crypto/quic_crypto_server_config.h
|
| @@ -115,10 +115,9 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
|
|
|
| // Generates a QuicServerConfigProtobuf protobuf suitable for
|
| // AddConfig and SetConfigs.
|
| - static QuicServerConfigProtobuf* GenerateConfig(
|
| - QuicRandom* rand,
|
| - const QuicClock* clock,
|
| - const ConfigOptions& options);
|
| + static QuicServerConfigProtobuf* GenerateConfig(QuicRandom* rand,
|
| + const QuicClock* clock,
|
| + const ConfigOptions& options);
|
|
|
| // AddConfig adds a QuicServerConfigProtobuf to the availible configurations.
|
| // It returns the SCFG message from the config if successful. The caller
|
| @@ -131,10 +130,9 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
|
| // AddDefaultConfig calls DefaultConfig to create a config and then calls
|
| // AddConfig to add it. See the comment for |DefaultConfig| for details of
|
| // the arguments.
|
| - CryptoHandshakeMessage* AddDefaultConfig(
|
| - QuicRandom* rand,
|
| - const QuicClock* clock,
|
| - const ConfigOptions& options);
|
| + CryptoHandshakeMessage* AddDefaultConfig(QuicRandom* rand,
|
| + const QuicClock* clock,
|
| + const ConfigOptions& options);
|
|
|
| // SetConfigs takes a vector of config protobufs and the current time.
|
| // Configs are assumed to be uniquely identified by their server config ID.
|
| @@ -167,11 +165,10 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
|
| // the client hello. The callback will always be called exactly
|
| // once, either under the current call stack, or after the
|
| // completion of an asynchronous operation.
|
| - void ValidateClientHello(
|
| - const CryptoHandshakeMessage& client_hello,
|
| - IPEndPoint client_ip,
|
| - const QuicClock* clock,
|
| - ValidateClientHelloResultCallback* done_cb) const;
|
| + void ValidateClientHello(const CryptoHandshakeMessage& client_hello,
|
| + IPEndPoint client_ip,
|
| + const QuicClock* clock,
|
| + ValidateClientHelloResultCallback* done_cb) const;
|
|
|
| // ProcessClientHello processes |client_hello| and decides whether to accept
|
| // or reject the connection. If the connection is to be accepted, |out| is
|
| @@ -367,12 +364,11 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
|
| ValidateClientHelloResultCallback* done_cb) const;
|
|
|
| // BuildRejection sets |out| to be a REJ message in reply to |client_hello|.
|
| - void BuildRejection(
|
| - const Config& config,
|
| - const CryptoHandshakeMessage& client_hello,
|
| - const ClientHelloInfo& info,
|
| - QuicRandom* rand,
|
| - CryptoHandshakeMessage* out) const;
|
| + void BuildRejection(const Config& config,
|
| + const CryptoHandshakeMessage& client_hello,
|
| + const ClientHelloInfo& info,
|
| + QuicRandom* rand,
|
| + CryptoHandshakeMessage* out) const;
|
|
|
| // ParseConfigProtobuf parses the given config protobuf and returns a
|
| // scoped_refptr<Config> if successful. The caller adopts the reference to the
|
| @@ -381,20 +377,18 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
|
|
|
| // NewSourceAddressToken returns a fresh source address token for the given
|
| // IP address.
|
| - std::string NewSourceAddressToken(
|
| - const Config& config,
|
| - const IPEndPoint& ip,
|
| - QuicRandom* rand,
|
| - QuicWallTime now) const;
|
| + std::string NewSourceAddressToken(const Config& config,
|
| + const IPEndPoint& ip,
|
| + QuicRandom* rand,
|
| + QuicWallTime now) const;
|
|
|
| // ValidateSourceAddressToken returns true if the source address token in
|
| // |token| is a valid and timely token for the IP address |ip| given that the
|
| // current time is |now|.
|
| - bool ValidateSourceAddressToken(
|
| - const Config& config,
|
| - base::StringPiece token,
|
| - const IPEndPoint& ip,
|
| - QuicWallTime now) const;
|
| + bool ValidateSourceAddressToken(const Config& config,
|
| + base::StringPiece token,
|
| + const IPEndPoint& ip,
|
| + QuicWallTime now) const;
|
|
|
| // NewServerNonce generates and encrypts a random nonce.
|
| std::string NewServerNonce(QuicRandom* rand, QuicWallTime now) const;
|
|
|