| Index: net/quic/quic_crypto_server_stream.cc
|
| diff --git a/net/quic/quic_crypto_server_stream.cc b/net/quic/quic_crypto_server_stream.cc
|
| index c9ed0ece69750738affaea5593a3bb09d679e901..296d05dbb741e44d5291178bd4c3fd906dd9671a 100644
|
| --- a/net/quic/quic_crypto_server_stream.cc
|
| +++ b/net/quic/quic_crypto_server_stream.cc
|
| @@ -76,8 +76,8 @@ void QuicCryptoServerStream::FinishProcessingHandshakeMessage(
|
|
|
| string error_details;
|
| CryptoHandshakeMessage reply;
|
| - QuicErrorCode error = ProcessClientHello(
|
| - message, result, &reply, &error_details);
|
| + QuicErrorCode error =
|
| + ProcessClientHello(message, result, &reply, &error_details);
|
|
|
| if (error != QUIC_NO_ERROR) {
|
| CloseConnectionWithDetails(error, error_details);
|
| @@ -108,8 +108,7 @@ void QuicCryptoServerStream::FinishProcessingHandshakeMessage(
|
| session()->connection()->SetEncrypter(
|
| ENCRYPTION_INITIAL,
|
| crypto_negotiated_params_.initial_crypters.encrypter.release());
|
| - session()->connection()->SetDefaultEncryptionLevel(
|
| - ENCRYPTION_INITIAL);
|
| + session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_INITIAL);
|
| // Set the decrypter immediately so that we no longer accept unencrypted
|
| // packets.
|
| session()->connection()->SetDecrypter(
|
| @@ -120,11 +119,11 @@ void QuicCryptoServerStream::FinishProcessingHandshakeMessage(
|
| session()->connection()->SetEncrypter(
|
| ENCRYPTION_FORWARD_SECURE,
|
| crypto_negotiated_params_.forward_secure_crypters.encrypter.release());
|
| - session()->connection()->SetDefaultEncryptionLevel(
|
| - ENCRYPTION_FORWARD_SECURE);
|
| + session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
|
| session()->connection()->SetAlternativeDecrypter(
|
| crypto_negotiated_params_.forward_secure_crypters.decrypter.release(),
|
| - ENCRYPTION_FORWARD_SECURE, false /* don't latch */);
|
| + ENCRYPTION_FORWARD_SECURE,
|
| + false /* don't latch */);
|
|
|
| encryption_established_ = true;
|
| handshake_confirmed_ = true;
|
| @@ -145,8 +144,8 @@ bool QuicCryptoServerStream::GetBase64SHA256ClientChannelID(
|
| uint8 digest[32];
|
| hash->Finish(digest, sizeof(digest));
|
|
|
| - base::Base64Encode(string(
|
| - reinterpret_cast<const char*>(digest), sizeof(digest)), output);
|
| + base::Base64Encode(
|
| + string(reinterpret_cast<const char*>(digest), sizeof(digest)), output);
|
| // Remove padding.
|
| size_t len = output->size();
|
| if (len >= 2) {
|
| @@ -175,11 +174,14 @@ QuicErrorCode QuicCryptoServerStream::ProcessClientHello(
|
| session()->connection()->max_flow_control_receive_window_bytes(),
|
| session()->connection()->clock(),
|
| session()->connection()->random_generator(),
|
| - &crypto_negotiated_params_, reply, error_details);
|
| + &crypto_negotiated_params_,
|
| + reply,
|
| + error_details);
|
| }
|
|
|
| QuicCryptoServerStream::ValidateCallback::ValidateCallback(
|
| - QuicCryptoServerStream* parent) : parent_(parent) {
|
| + QuicCryptoServerStream* parent)
|
| + : parent_(parent) {
|
| }
|
|
|
| void QuicCryptoServerStream::ValidateCallback::Cancel() {
|
|
|