Land Recent QUIC changes

net/quic/crypto/common_cert_set.cc

 // Copyright (c) 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/common_cert_set.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/quic/quic_utils.h"
 
 using base::StringPiece;
 
 namespace net {
 
 namespace common_cert_set_0 {
 #include "net/quic/crypto/common_cert_set_0.c"
 }
 
-
 struct CertSet {
+  // num_certs contains the number of certificates in this set.
   size_t num_certs;
+  // certs is an array of |num_certs| pointers to the DER encoded certificates.
   const unsigned char* const* certs;
+  // lens is an array of |num_certs| integers describing the length, in bytes,
+  // of each certificate.
   const size_t* lens;
+  // hash contains the 64-bit, FNV-1a hash of this set.
   uint64 hash;
 };
 
 static const CertSet kSets[] = {
   {
     common_cert_set_0::kNumCerts,
     common_cert_set_0::kCerts,
     common_cert_set_0::kLens,
     common_cert_set_0::kHash,
   },
 };
 
 static const uint64 kSetHashes[] = {
   common_cert_set_0::kHash,
 };
 
-CommonCertSet::~CommonCertSet() {
+CommonCertSets::~CommonCertSets() {
 }
 
-CommonCertSetQUIC::CommonCertSetQUIC() {
+CommonCertSetsQUIC::CommonCertSetsQUIC() {
 }
 
-StringPiece CommonCertSetQUIC::GetCommonHashes() {
+StringPiece CommonCertSetsQUIC::GetCommonHashes() const {
   return StringPiece(reinterpret_cast<const char*>(kSetHashes),
                      sizeof(uint64) * arraysize(kSetHashes));
 }
 
-StringPiece CommonCertSetQUIC::GetCert(uint64 hash, uint32 index) {
+StringPiece CommonCertSetsQUIC::GetCert(uint64 hash, uint32 index) const {
   for (size_t i = 0; i < arraysize(kSets); i++) {
     if (kSets[i].hash == hash) {
       if (index >= kSets[i].num_certs) {
         return StringPiece();
       }
       return StringPiece(reinterpret_cast<const char*>(kSets[i].certs[index]),
                          kSets[i].lens[index]);
     }
   }
 
@@ skipping 13 matching lines @@
   }
 
   if (a.size() < b_len) {
     return -1;
   } else if (a.size() > b_len) {
     return 1;
   }
   return 0;
 }
 
-bool CommonCertSetQUIC::MatchCert(StringPiece cert,
-                                  StringPiece common_set_hashes,
-                                  uint64* out_hash,
-                                  uint32* out_index) {
+bool CommonCertSetsQUIC::MatchCert(StringPiece cert,
+                                   StringPiece common_set_hashes,
+                                   uint64* out_hash,
+                                   uint32* out_index) const {
   if (common_set_hashes.size() % sizeof(uint64) != 0) {
     return false;
   }
 
   for (size_t i = 0; i < common_set_hashes.size() / sizeof(uint64); i++) {
     uint64 hash;
     memcpy(&hash, common_set_hashes.data() + i*sizeof(uint64), sizeof(uint64));
 
     for (size_t j = 0; j < arraysize(kSets); j++) {
       if (kSets[j].hash != hash) {
@@ skipping 27 matching lines @@
           return true;
         }
       }
     }
   }
 
   return false;
 }
 
 }  // namespace net