Land Recent QUIC Changes.

net/quic/crypto/quic_crypto_server_config.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
 #define NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 22 matching lines @@
 class QuicServerConfigProtobuf;
 class StrikeRegister;
 class StrikeRegisterClient;
 
 struct ClientHelloInfo;
 
 namespace test {
 class QuicCryptoServerConfigPeer;
 }  // namespace test
 
-enum HandshakeFailureReason {
-  HANDSHAKE_OK = 0,
-
-  // Failure reasons for an invalid client nonce in CHLO.
-  //
-  // TODO(rtenneti): Implement capturing of error from strike register.
-  CLIENT_NONCE_UNKNOWN_FAILURE = 100,
-  // Invalid client nonce. A possible reason, client nonce had incorrect length.
-  CLIENT_NONCE_INVALID_FAILURE,
-
-  // Failure reasons for an invalid server nonce in CHLO.
-  SERVER_NONCE_INVALID_FAILURE = 200,  // Nonce had incorrect length.
-  SERVER_NONCE_DECRYPTION_FAILURE,     // Unbox of nonce failed.
-  SERVER_NONCE_NOT_UNIQUE_FAILURE,     // Nonce is not unique.
-
-  // Failure reasons for an invalid server config in CHLO.
-  //
-  // Missing Server config id (kSCID) tag.
-  SERVER_CONFIG_INCHOATE_HELLO_FAILURE = 300,
-  // GetConfigWithScid couldn't find the Server config id (kSCID).
-  SERVER_CONFIG_UNKNOWN_CONFIG_FAILURE,
-
-  // Failure reasons for an invalid source-address token.
-  //
-  // Missing Source-address token (kSourceAddressTokenTag) tag.
-  SOURCE_ADDRESS_TOKEN_INVALID_FAILURE = 400,
-  // Unbox of Source-address token failed.
-  SOURCE_ADDRESS_TOKEN_DECRYPTION_FAILURE,
-  // Couldn't parse the unbox'ed Source-address token.
-  SOURCE_ADDRESS_TOKEN_PARSE_FAILURE,
-  // Source-address token is for a different IP address.
-  SOURCE_ADDRESS_TOKEN_DIFFERENT_IP_ADDRESS_FAILURE,
-  // The difference between the time in source-address token and |now| is more
-  // than |source_address_token_future_secs_|.
-  SOURCE_ADDRESS_TOKEN_CLOCK_SKEW_FAILURE,
-  // The difference between the time in source-address token and |now| is more
-  // than |source_address_token_lifetime_secs_|.
-  SOURCE_ADDRESS_TOKEN_EXPIRED_FAILURE,
-};
-
 // Hook that allows application code to subscribe to primary config changes.
 class PrimaryConfigChangedCallback {
  public:
   PrimaryConfigChangedCallback();
   virtual ~PrimaryConfigChangedCallback();
   virtual void Run(const std::string& scid) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PrimaryConfigChangedCallback);
 };
@@ skipping 416 matching lines @@
   uint32 source_address_token_lifetime_secs_;
   uint32 server_nonce_strike_register_max_entries_;
   uint32 server_nonce_strike_register_window_secs_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoServerConfig);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_