Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/quic/chromium/crypto/proof_verifier_chromium.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/chromium/crypto/proof_verifier_chromium.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 497 matching lines @@
                              reinterpret_cast<const uint8_t*>(spki.data()),
                              spki.size())) {
       DLOG(WARNING) << "VerifyInit failed";
       return false;
     }
   } else {
     LOG(ERROR) << "Unsupported public key type " << type;
     return false;
   }
 
-  if (quic_version <= QUIC_VERSION_30) {
-    verifier.VerifyUpdate(
-        reinterpret_cast<const uint8_t*>(kProofSignatureLabelOld),
-        sizeof(kProofSignatureLabelOld));
-  } else {
-    verifier.VerifyUpdate(
-        reinterpret_cast<const uint8_t*>(kProofSignatureLabel),
-        sizeof(kProofSignatureLabel));
-    uint32_t len = chlo_hash.length();
-    verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(&len), sizeof(len));
-    verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(chlo_hash.data()),
-                          len);
-  }
+  verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(kProofSignatureLabel),
+                        sizeof(kProofSignatureLabel));
+  uint32_t len = chlo_hash.length();
+  verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(&len), sizeof(len));
+  verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(chlo_hash.data()),
+                        len);
 
   verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(signed_data.data()),
                         signed_data.size());
 
   if (!verifier.VerifyFinal()) {
     DLOG(WARNING) << "VerifyFinal failed";
     return false;
   }
 
   DVLOG(1) << "VerifyFinal success";
@@ skipping 73 matching lines @@
     active_jobs_.insert(job.release());
   return status;
 }
 
 void ProofVerifierChromium::OnJobComplete(Job* job) {
   active_jobs_.erase(job);
   delete job;
 }
 
 }  // namespace net