Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Side by Side Diff: chrome/renderer/origin_trials/origin_trial_key_manager.cc

Issue 1737693002: Allow command-line arguments to override EF public key (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix use-after-free due to StringPiece shared state Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/origin_trials/origin_trial_key_manager.h" 5 #include "chrome/renderer/origin_trials/origin_trial_key_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/base64.h"
10
9 // This is the default public key used for validating signatures. 11 // This is the default public key used for validating signatures.
10 // TODO(iclelland): Provide a mechanism to allow for multiple signing keys. 12 // TODO(iclelland): Provide a mechanism to allow for multiple signing keys.
11 // https://crbug.com/584737 13 // https://crbug.com/584737
12 // TODO(iclelland): Provide a mechanism to override, replace or disable this key 14 static const uint8_t kDefaultPublicKey[] = {
13 // with field trials.
14 static const uint8_t kPublicKey[] = {
15 0x7c, 0xc4, 0xb8, 0x9a, 0x93, 0xba, 0x6e, 0xe2, 0xd0, 0xfd, 0x03, 15 0x7c, 0xc4, 0xb8, 0x9a, 0x93, 0xba, 0x6e, 0xe2, 0xd0, 0xfd, 0x03,
16 0x1d, 0xfb, 0x32, 0x66, 0xc7, 0x3b, 0x72, 0xfd, 0x54, 0x3a, 0x07, 16 0x1d, 0xfb, 0x32, 0x66, 0xc7, 0x3b, 0x72, 0xfd, 0x54, 0x3a, 0x07,
17 0x51, 0x14, 0x66, 0xaa, 0x02, 0x53, 0x4e, 0x33, 0xa1, 0x15, 17 0x51, 0x14, 0x66, 0xaa, 0x02, 0x53, 0x4e, 0x33, 0xa1, 0x15,
18 }; 18 };
19 19
20 base::StringPiece OriginTrialKeyManager::GetPublicKey() { 20 OriginTrialKeyManager::OriginTrialKeyManager()
21 return base::StringPiece(reinterpret_cast<const char*>(kPublicKey), 21 : public_key_(std::string(reinterpret_cast<const char*>(kDefaultPublicKey),
22 arraysize(kPublicKey)); 22 arraysize(kDefaultPublicKey))) {}
23
24 OriginTrialKeyManager::~OriginTrialKeyManager() {}
25
26 bool OriginTrialKeyManager::SetPublicKeyFromASCIIString(
27 const std::string& ascii_public_key) {
28 // Base64-decode the incoming string. Set the key if it is correctly formatted
29 std::string new_public_key;
30 if (!base::Base64Decode(ascii_public_key, &new_public_key))
31 return false;
32 if (new_public_key.size() != 32)
33 return false;
34 public_key_.swap(new_public_key);
35 return true;
23 } 36 }
37
38 base::StringPiece OriginTrialKeyManager::GetPublicKey() const {
39 return base::StringPiece(public_key_);
40 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698