Index: content/renderer/origin_trials/trial_token.cc |
diff --git a/content/renderer/origin_trials/trial_token.cc b/content/renderer/origin_trials/trial_token.cc |
index f993102fe22714227509a6b31ad1eeec98cbb274..3bce34ab259a6e5b11a6094960ec9f3726d20214 100644 |
--- a/content/renderer/origin_trials/trial_token.cc |
+++ b/content/renderer/origin_trials/trial_token.cc |
@@ -21,15 +21,6 @@ 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 |
@@ -90,12 +81,11 @@ bool TrialToken::IsAppropriate(const std::string& origin, |
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/10 05:24:23
Nit: This is the wrong bug number (543220 is for s
iclelland
2016/02/10 20:31:00
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 { |