Skip to content

[2.0] Fix secp256k1 signature validation and add unit tests #266

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
elmato merged 1 commit into from
Jul 31, 2025
Merged

[2.0] Fix secp256k1 signature validation and add unit tests #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion silkworm/core/crypto/secp256k1n.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ bool is_valid_signature(const intx::uint256& r, const intx::uint256& s, bool hom
if (!r || !s) {
return false;
}
if (r >= kSecp256k1n && s >= kSecp256k1n) {
if (r >= kSecp256k1n || s >= kSecp256k1n) {
return false;
}
// https://eips.ethereum.org/EIPS/eip-2
Expand Down
36 changes: 36 additions & 0 deletions silkworm/core/crypto/secp256k1n_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright 2025 The Silkworm Authors
// SPDX-License-Identifier: Apache-2.0

#include "secp256k1n.hpp"

#include <catch2/catch.hpp>

namespace silkworm {

TEST_CASE("is_valid_signature") {
bool homestead = false;
CHECK(!is_valid_signature(0, 0, homestead));
CHECK(!is_valid_signature(0, 1, homestead));
CHECK(!is_valid_signature(1, 0, homestead));
CHECK(is_valid_signature(1, 1, homestead));
CHECK(is_valid_signature(1, kSecp256k1Halfn, homestead));
CHECK(is_valid_signature(1, kSecp256k1Halfn + 1, homestead));
CHECK(is_valid_signature(kSecp256k1n - 1, kSecp256k1n - 1, homestead));
CHECK(!is_valid_signature(kSecp256k1n - 1, kSecp256k1n, homestead));
CHECK(!is_valid_signature(kSecp256k1n, kSecp256k1n - 1, homestead));
CHECK(!is_valid_signature(kSecp256k1n, kSecp256k1n, homestead));

homestead = true;
CHECK(!is_valid_signature(0, 0, homestead));
CHECK(!is_valid_signature(0, 1, homestead));
CHECK(!is_valid_signature(1, 0, homestead));
CHECK(is_valid_signature(1, 1, homestead));
CHECK(is_valid_signature(1, kSecp256k1Halfn, homestead));
CHECK(!is_valid_signature(1, kSecp256k1Halfn + 1, homestead));
CHECK(!is_valid_signature(kSecp256k1n - 1, kSecp256k1n - 1, homestead));
CHECK(!is_valid_signature(kSecp256k1n - 1, kSecp256k1n, homestead));
CHECK(!is_valid_signature(kSecp256k1n, kSecp256k1n - 1, homestead));
CHECK(!is_valid_signature(kSecp256k1n, kSecp256k1n, homestead));
}

} // namespace silkworm