| Index: net/quic/crypto/common_cert_set.cc
|
| diff --git a/net/quic/crypto/common_cert_set.cc b/net/quic/crypto/common_cert_set.cc
|
| index f631cd6fc46a81cc4bf9bd3b83af0d5a9b557786..9ea854a1524801cdac4fd3eaf74a4b30544e3701 100644
|
| --- a/net/quic/crypto/common_cert_set.cc
|
| +++ b/net/quic/crypto/common_cert_set.cc
|
| @@ -32,16 +32,14 @@ struct CertSet {
|
| };
|
|
|
| const CertSet kSets[] = {
|
| - {
|
| - common_cert_set_0::kNumCerts,
|
| - common_cert_set_0::kCerts,
|
| - common_cert_set_0::kLens,
|
| - common_cert_set_0::kHash,
|
| - },
|
| + {
|
| + common_cert_set_0::kNumCerts, common_cert_set_0::kCerts,
|
| + common_cert_set_0::kLens, common_cert_set_0::kHash,
|
| + },
|
| };
|
|
|
| const uint64 kSetHashes[] = {
|
| - common_cert_set_0::kHash,
|
| + common_cert_set_0::kHash,
|
| };
|
|
|
| // Compare returns a value less than, equal to or greater than zero if |a| is
|
| @@ -89,16 +87,18 @@ class CommonCertSetsQUIC : public CommonCertSets {
|
| return StringPiece();
|
| }
|
|
|
| - virtual bool MatchCert(StringPiece cert, StringPiece common_set_hashes,
|
| - uint64* out_hash, uint32* out_index) const OVERRIDE {
|
| + virtual bool MatchCert(StringPiece cert,
|
| + StringPiece common_set_hashes,
|
| + uint64* out_hash,
|
| + uint32* out_index) const OVERRIDE {
|
| 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));
|
| + 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) {
|
| @@ -148,7 +148,8 @@ class CommonCertSetsQUIC : public CommonCertSets {
|
|
|
| } // anonymous namespace
|
|
|
| -CommonCertSets::~CommonCertSets() {}
|
| +CommonCertSets::~CommonCertSets() {
|
| +}
|
|
|
| // static
|
| const CommonCertSets* CommonCertSets::GetInstanceQUIC() {
|
|
|