[Experimental Framework] Move the trial token public key out of content and into the embedder.

content/common/origin_trials/trial_token.cc

 // Copyright 2015 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 "content/common/origin_trials/trial_token.h"
 
 #include <openssl/curve25519.h>
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "url/origin.h"
 
 namespace content {
 
 namespace {
 
-// This is the default public key used for validating signatures.
-// TODO(iclelland): Move this to the embedder, and provide a mechanism to allow
-// for multiple signing keys. https://crbug.com/543220
-static const uint8_t kPublicKey[] = {
-    0x7c, 0xc4, 0xb8, 0x9a, 0x93, 0xba, 0x6e, 0xe2, 0xd0, 0xfd, 0x03,
-    0x1d, 0xfb, 0x32, 0x66, 0xc7, 0x3b, 0x72, 0xfd, 0x54, 0x3a, 0x07,
-    0x51, 0x14, 0x66, 0xaa, 0x02, 0x53, 0x4e, 0x33, 0xa1, 0x15,
-};
-
 const char* kFieldSeparator = "|";
 
 }  // namespace
 
 TrialToken::~TrialToken() {}
 
 scoped_ptr<TrialToken> TrialToken::Parse(const std::string& token_text) {
   if (token_text.empty()) {
     return nullptr;
   }
@@ skipping 40 matching lines @@
       data_(data),
       origin_(origin),
       feature_name_(feature_name),
       expiry_timestamp_(expiry_timestamp) {}
 
 bool TrialToken::IsAppropriate(const std::string& origin,
                                const std::string& feature_name) const {
   return ValidateOrigin(origin) && ValidateFeatureName(feature_name);
 }
 
-bool TrialToken::IsValid(const base::Time& now) const {
+bool TrialToken::IsValid(const base::Time& now,
+                         const base::StringPiece& public_key) const {
   // TODO(iclelland): Allow for multiple signing keys, and iterate over all
   // active keys here. https://crbug.com/543220

[chasej, 2016/02/05 19:35:28]

Nit: This is the wrong bug number (543220 is for supporting a single signing
key).  I've added a new bug for multiple keys: 584737.

[iclelland, 2016/02/05 20:18:09]

Thanks! Done.

-  return ValidateDate(now) &&
-         ValidateSignature(base::StringPiece(
-             reinterpret_cast<const char*>(kPublicKey), arraysize(kPublicKey)));
+  return ValidateDate(now) && ValidateSignature(public_key);
 }
 
 bool TrialToken::ValidateOrigin(const std::string& origin) const {
   return GURL(origin) == origin_;
 }
 
 bool TrialToken::ValidateFeatureName(const std::string& feature_name) const {
   return base::EqualsCaseInsensitiveASCII(feature_name, feature_name_);
 }
 
@@ skipping 25 matching lines @@
   }
 
   int result = ED25519_verify(
       reinterpret_cast<const uint8_t*>(data.data()), data.length(),
       reinterpret_cast<const uint8_t*>(signature.data()),
       reinterpret_cast<const uint8_t*>(public_key.data()));
   return (result != 0);
 }
 
 }  // namespace content