relnote: Deprecate --reloadable_flag_quic_use_hash_in_scup

net/quic/crypto/quic_crypto_server_config.cc

 // 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.
 
 #include "net/quic/crypto/quic_crypto_server_config.h"
 
 #include <stdlib.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 1182 matching lines @@
         clock->WallNow(), cached_network_params);
   }
 
   out->set_tag(kSCUP);
   out->SetStringPiece(kSCFG, serialized);
   out->SetStringPiece(kSourceAddressTokenTag, source_address_token);
 
   scoped_refptr<ProofSource::Chain> chain;
   string signature;
   string cert_sct;
-  if (FLAGS_quic_use_hash_in_scup) {
-    if (!proof_source_->GetProof(server_ip, params.sni, serialized, version,
-                                 chlo_hash, params.x509_ecdsa_supported, &chain,
-                                 &signature, &cert_sct)) {
-      DVLOG(1) << "Server: failed to get proof.";
-      return false;
-    }
-  } else {
-    if (!proof_source_->GetProof(
-            server_ip, params.sni, serialized, version, params.client_nonce,
-            params.x509_ecdsa_supported, &chain, &signature, &cert_sct)) {
-      DVLOG(1) << "Server: failed to get proof.";
-      return false;
-    }
+  if (!proof_source_->GetProof(server_ip, params.sni, serialized, version,
+                               chlo_hash, params.x509_ecdsa_supported, &chain,
+                               &signature, &cert_sct)) {
+    DVLOG(1) << "Server: failed to get proof.";
+    return false;
   }
 
   const string compressed = CompressChain(
       compressed_certs_cache, chain, params.client_common_set_hashes,
       params.client_cached_cert_hashes, common_cert_sets);
 
   out->SetStringPiece(kCertificateTag, compressed);
   out->SetStringPiece(kPROF, signature);
   if (params.sct_supported_by_client && version > QUIC_VERSION_29 &&
       enable_serving_sct_) {
@@ skipping 33 matching lines @@
   CryptoHandshakeMessage message;
   message.set_tag(kSCUP);
   message.SetStringPiece(kSCFG, serialized);
   message.SetStringPiece(kSourceAddressTokenTag, source_address_token);
 
   std::unique_ptr<BuildServerConfigUpdateMessageProofSourceCallback>
       proof_source_cb(new BuildServerConfigUpdateMessageProofSourceCallback(
           this, version, compressed_certs_cache, common_cert_sets, params,
           std::move(message), std::move(cb)));
 
-  if (FLAGS_quic_use_hash_in_scup) {
-    proof_source_->GetProof(server_ip, params.sni, serialized, version,
-                            chlo_hash, params.x509_ecdsa_supported,
-                            std::move(proof_source_cb));
-  } else {
-    proof_source_->GetProof(server_ip, params.sni, serialized, version,
-                            params.client_nonce, params.x509_ecdsa_supported,
-                            std::move(proof_source_cb));
-  }
+  proof_source_->GetProof(server_ip, params.sni, serialized, version, chlo_hash,
+                          params.x509_ecdsa_supported,
+                          std::move(proof_source_cb));
 }
 
 QuicCryptoServerConfig::BuildServerConfigUpdateMessageProofSourceCallback::
     ~BuildServerConfigUpdateMessageProofSourceCallback() {}
 
 QuicCryptoServerConfig::BuildServerConfigUpdateMessageProofSourceCallback::
     BuildServerConfigUpdateMessageProofSourceCallback(
         const QuicCryptoServerConfig* config,
         QuicVersion version,
         QuicCompressedCertsCache* compressed_certs_cache,
@@ skipping 676 matching lines @@
       priority(0),
       source_address_token_boxer(nullptr) {}
 
 QuicCryptoServerConfig::Config::~Config() {
   STLDeleteElements(&key_exchanges);
 }
 
 QuicCryptoProof::QuicCryptoProof() {}
 QuicCryptoProof::~QuicCryptoProof() {}
 }  // namespace net