Commit a992c363 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

[jumbo] Too many kSha256Hash

Earlier this year, all kSha2Hash got longer names but two
kSha256Hash must have remained, and now they ended up in
the same translation unit and jumbo on Windows stopped
compiling. This renaming follows the pattern of earlier renames.

TBR=thestig@chromium.org

Change-Id: I95b7d6b7e5f43f25bee8e98aa3eeeb4de9d7e55f
Reviewed-on: https://chromium-review.googlesource.com/999415Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#548730}
parent c4341e26
...@@ -49,10 +49,10 @@ static const char kManifestDisabledTokenSignaturesPath[] = ...@@ -49,10 +49,10 @@ static const char kManifestDisabledTokenSignaturesPath[] =
"origin-trials.disabled-tokens.signatures"; "origin-trials.disabled-tokens.signatures";
// Extension id is llkgjffcdpffmhiakmfcdcblohccpfmo // Extension id is llkgjffcdpffmhiakmfcdcblohccpfmo
const uint8_t kSha256Hash[] = {0xbb, 0xa6, 0x95, 0x52, 0x3f, 0x55, 0xc7, 0x80, const uint8_t kOriginTrialSha2Hash[] = {
0xac, 0x52, 0x32, 0x1b, 0xe7, 0x22, 0xf5, 0xce, 0xbb, 0xa6, 0x95, 0x52, 0x3f, 0x55, 0xc7, 0x80, 0xac, 0x52, 0x32,
0x6a, 0xfd, 0x9c, 0x9e, 0xa9, 0x2a, 0x0b, 0x50, 0x1b, 0xe7, 0x22, 0xf5, 0xce, 0x6a, 0xfd, 0x9c, 0x9e, 0xa9, 0x2a,
0x60, 0x2b, 0x7f, 0x6c, 0x64, 0x80, 0x09, 0x04}; 0x0b, 0x50, 0x60, 0x2b, 0x7f, 0x6c, 0x64, 0x80, 0x09, 0x04};
} // namespace } // namespace
...@@ -127,7 +127,8 @@ void OriginTrialsComponentInstallerPolicy::GetHash( ...@@ -127,7 +127,8 @@ void OriginTrialsComponentInstallerPolicy::GetHash(
std::vector<uint8_t>* hash) const { std::vector<uint8_t>* hash) const {
if (!hash) if (!hash)
return; return;
hash->assign(kSha256Hash, kSha256Hash + arraysize(kSha256Hash)); hash->assign(kOriginTrialSha2Hash,
kOriginTrialSha2Hash + arraysize(kOriginTrialSha2Hash));
} }
std::string OriginTrialsComponentInstallerPolicy::GetName() const { std::string OriginTrialsComponentInstallerPolicy::GetName() const {
......
...@@ -68,10 +68,10 @@ enum SRTCompleted { ...@@ -68,10 +68,10 @@ enum SRTCompleted {
// CRX hash. The extension id is: gkmgaooipdjhmangpemjhigmamcehddo. The hash was // CRX hash. The extension id is: gkmgaooipdjhmangpemjhigmamcehddo. The hash was
// generated in Python with something like this: // generated in Python with something like this:
// hashlib.sha256().update(open("<file>.crx").read()[16:16+294]).digest(). // hashlib.sha256().update(open("<file>.crx").read()[16:16+294]).digest().
const uint8_t kSha256Hash[] = {0x6a, 0xc6, 0x0e, 0xe8, 0xf3, 0x97, 0xc0, 0xd6, const uint8_t kSwReporterSha2Hash[] = {
0xf4, 0xc9, 0x78, 0x6c, 0x0c, 0x24, 0x73, 0x3e, 0x6a, 0xc6, 0x0e, 0xe8, 0xf3, 0x97, 0xc0, 0xd6, 0xf4, 0xc9, 0x78,
0x05, 0xa5, 0x62, 0x4b, 0x2e, 0xc7, 0xb7, 0x1c, 0x6c, 0x0c, 0x24, 0x73, 0x3e, 0x05, 0xa5, 0x62, 0x4b, 0x2e, 0xc7,
0x5f, 0xea, 0xf0, 0x88, 0xf6, 0x97, 0x9b, 0xc7}; 0xb7, 0x1c, 0x5f, 0xea, 0xf0, 0x88, 0xf6, 0x97, 0x9b, 0xc7};
const base::FilePath::CharType kSwReporterExeName[] = const base::FilePath::CharType kSwReporterExeName[] =
FILE_PATH_LITERAL("software_reporter_tool.exe"); FILE_PATH_LITERAL("software_reporter_tool.exe");
...@@ -392,7 +392,8 @@ base::FilePath SwReporterInstallerPolicy::GetRelativeInstallDir() const { ...@@ -392,7 +392,8 @@ base::FilePath SwReporterInstallerPolicy::GetRelativeInstallDir() const {
void SwReporterInstallerPolicy::GetHash(std::vector<uint8_t>* hash) const { void SwReporterInstallerPolicy::GetHash(std::vector<uint8_t>* hash) const {
DCHECK(hash); DCHECK(hash);
hash->assign(kSha256Hash, kSha256Hash + sizeof(kSha256Hash)); hash->assign(kSwReporterSha2Hash,
kSwReporterSha2Hash + sizeof(kSwReporterSha2Hash));
} }
std::string SwReporterInstallerPolicy::GetName() const { std::string SwReporterInstallerPolicy::GetName() const {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment