Skip to content

check HKDF return value in release builds to prevent zero-key signing #34332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diracdeltas merged 3 commits into from
Feb 28, 2026
+5 −3
Merged

check HKDF return value in release builds to prevent zero-key signing #34332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d16ad6
check HKDF return value in release builds to prevent zero-key signing
diracdeltas Feb 27, 2026
2c102d9
fix license header
diracdeltas Feb 28, 2026
52a4dc3
revert year change in copyright header
kdenhartog Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion components/brave_rewards/core/engine/util/signer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ std::optional<Signer> Signer::FromRecoverySeed(
recovery_seed.data(), kSeedLength, kHkdfSalt, kSaltLength,
info, sizeof(info) / sizeof(info[0]));

DCHECK(hkdf_res);
if (!hkdf_res) {
return std::nullopt;
}

std::vector<uint8_t> public_key(crypto_sign_PUBLICKEYBYTES);
secret_key.resize(crypto_sign_SECRETKEYBYTES);
Expand Down
4 changes: 2 additions & 2 deletions components/brave_sync/crypto/crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Copyright 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */

#include "brave/components/brave_sync/crypto/crypto.h"

Expand Down Expand Up @@ -37,7 +37,7 @@ std::vector<uint8_t> HKDFSha512(const std::vector<uint8_t>& ikm,
HKDF(derived_key.data(), derived_key.size(), EVP_sha512(), ikm.data(),
ikm.size(), salt ? salt->data() : nullptr, salt ? salt->size() : 0,
info ? info->data() : nullptr, info ? info->size() : 0);
DCHECK(result);
CHECK(result);
return derived_key;
}

Expand Down
Loading