mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: migrate hashing code to new upstream crypto::hash API (#46273)

Browse source 
* refactor: migrate AsarFileValidator to crypto::hash

This change migrates AsarFileValidator's uses of crypto::secure_hash
to the new crypto::hash API, which has more memory safety and less
heap allocations.

Xref: 6287609

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: migrate ValidateIntegrityOrDie to crypto::hash

This change migrates ValidateIntegrityOrDie's use of crypto::SHA256Hash
to the new crypto::hash API, which has more memory safety and less heap
allocations.

Xref: 6287609

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2025-03-25 19:41:49 -05:00 • committed by GitHub
parent 5b9f71602d
commit 06ad763412
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shell/browser/net/asar/asar_file_validator.cc
View file

@ -14,7 +14,6 @@
#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "crypto/sha2.h"
namespace asar {
@ -34,7 +33,7 @@ void AsarFileValidator::EnsureBlockHashExists() {
current_hash_byte_count_ = 0U;
switch (integrity_.algorithm) {
case HashAlgorithm::kSHA256:
current_hash_ = crypto::SecureHash::Create(crypto::SecureHash::SHA256);
current_hash_.emplace(crypto::hash::kSha256);
break;
case HashAlgorithm::kNone:
NOTREACHED();
@ -86,7 +85,7 @@ bool AsarFileValidator::FinishBlock() {
if (!current_hash_) {
// This happens when we fail to read the resource. Compute empty content's
// hash in this case.
current_hash_ = crypto::SecureHash::Create(crypto::SecureHash::SHA256);
current_hash_.emplace(crypto::hash::kSha256);
}
// If the file reader is done we need to make sure we've either read up to the
@ -108,7 +107,7 @@ bool AsarFileValidator::FinishBlock() {
current_hash_->Update(abandoned_buffer);
}
auto actual = std::array<uint8_t, crypto::kSHA256Length>{};
auto actual = std::array<uint8_t, crypto::hash::kSha256Size>{};
current_hash_->Finish(actual);
current_hash_.reset();
current_hash_byte_count_ = 0;