Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / quic / crypto / common_cert_set.cc

diff --git a/src/net/quic/crypto/common_cert_set.cc b/src/net/quic/crypto/common_cert_set.cc
index f631cd6..09379f3 100644 (file)
--- a/src/net/quic/crypto/common_cert_set.cc
+++ b/src/net/quic/crypto/common_cert_set.cc
@@ -17,6 +17,10 @@ namespace common_cert_set_0 {
 #include "net/quic/crypto/common_cert_set_0.c"
 }
 
+namespace common_cert_set_1 {
+#include "net/quic/crypto/common_cert_set_1.c"
+}
+
 namespace {
 
 struct CertSet {
@@ -38,10 +42,17 @@ const CertSet kSets[] = {
     common_cert_set_0::kLens,
     common_cert_set_0::kHash,
   },
+  {
+    common_cert_set_1::kNumCerts,
+    common_cert_set_1::kCerts,
+    common_cert_set_1::kLens,
+    common_cert_set_1::kHash,
+  },
 };
 
 const uint64 kSetHashes[] = {
   common_cert_set_0::kHash,
+  common_cert_set_1::kHash,
 };
 
 // Compare returns a value less than, equal to or greater than zero if |a| is
@@ -69,12 +80,12 @@ int Compare(StringPiece a, const unsigned char* b, size_t b_len) {
 class CommonCertSetsQUIC : public CommonCertSets {
  public:
   // CommonCertSets interface.
-  virtual StringPiece GetCommonHashes() const OVERRIDE {
+  StringPiece GetCommonHashes() const override {
     return StringPiece(reinterpret_cast<const char*>(kSetHashes),
                        sizeof(uint64) * arraysize(kSetHashes));
   }
 
-  virtual StringPiece GetCert(uint64 hash, uint32 index) const OVERRIDE {
+  StringPiece GetCert(uint64 hash, uint32 index) const override {
     for (size_t i = 0; i < arraysize(kSets); i++) {
       if (kSets[i].hash == hash) {
         if (index < kSets[i].num_certs) {
@@ -89,8 +100,10 @@ class CommonCertSetsQUIC : public CommonCertSets {
     return StringPiece();
   }
 
-  virtual bool MatchCert(StringPiece cert, StringPiece common_set_hashes,
-                         uint64* out_hash, uint32* out_index) const OVERRIDE {
+  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;
     }