Skip to content

fix: prevent DoS in Keypair::from_seed by replacing infinite loop with error handling #515

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: prevent DoS in Keypair::from_seed by replacing infinite loop with error handling #515

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
6e29f23
Update lib.rs
crStiv Sep 17, 2025
bc0c1c5
Update lib.rs
crStiv Sep 17, 2025
900c9da
Update shaping.rs
crStiv Sep 17, 2025
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
17 changes: 7 additions & 10 deletions multisig/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,13 @@ impl Keypair {
}

/// Generate keypair from a seed.
pub fn from_seed(seed: [u8; 32]) -> Self {
loop {
if let Ok(sk) = secp256k1::SecretKey::from_byte_array(seed) {
let pk = sk.public_key(secp256k1::SECP256K1);
return Self {
sk: SecretKey { key: sk },
pk: PublicKey { key: pk },
};
}
}
pub fn from_seed(seed: [u8; 32]) -> Result<Self, InvalidSecretKey> {
let sk = secp256k1::SecretKey::from_byte_array(seed).map_err(|_| InvalidSecretKey(()))?;
let pk = sk.public_key(secp256k1::SECP256K1);
Ok(Self {
sk: SecretKey { key: sk },
pk: PublicKey { key: pk },
})
}

/// Returns ed25519 Public key.
Expand Down
2 changes: 1 addition & 1 deletion tests/src/tests/consensus/helpers/shaping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ impl Simulator {
for (b, s) in name.as_bytes().iter().zip(seed.iter_mut()) {
*s = *b
}
(name, Keypair::from_seed(seed))
(name, Keypair::from_seed(seed).expect("name-based seed should produce valid keypair"))
})
.collect();

Expand Down
2 changes: 1 addition & 1 deletion timeboost-utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub fn sig_keypair_from_seed_indexed(seed: [u8; 32], index: u64) -> multisig::Ke
hasher.update(&seed);
hasher.update(&index.to_le_bytes());
let new_seed = *hasher.finalize().as_bytes();
multisig::Keypair::from_seed(new_seed)
multisig::Keypair::from_seed(new_seed).expect("blake3 hash should always produce valid secp256k1 key")
}

pub fn dh_keypair_from_seed_indexed(seed: [u8; 32], index: u64) -> x25519::Keypair {
Expand Down
Loading