Skip to content
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

[Security]: Rename ExpandedSecretKey::sign_with_pubkey to dangerous_sign_with_pubkey #4154

Merged
merged 3 commits into from
Dec 11, 2024
Merged

[Security]: Rename ExpandedSecretKey::sign_with_pubkey to dangerous_sign_with_pubkey #4154

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d71c775
[Security]: Make `ExpandedSecretKey::sign_with_pubkey` unsafe
satoshiotomakan Dec 6, 2024
aad7ee8
[Security]: Rename `ExpandedSecretKey::sign_with_pubkey` to `dangerou…
satoshiotomakan Dec 6, 2024
a127d39
Merge branch 'master' into s/ed25519-key-exposure-attack
satoshiotomakan Dec 10, 2024
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
6 changes: 4 additions & 2 deletions rust/tw_keypair/src/ed25519/modifications/cardano/extended_keypair.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ impl<H: Hasher512> SigningKeyTrait for ExtendedKeyPair<H> {
type Signature = Signature;

fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
self.private()
.sign_with_public_key(self.public(), message.as_slice())
unsafe {
satoshiotomakan marked this conversation as resolved.
Show resolved Hide resolved
self.private()
.sign_with_public_key(self.public(), message.as_slice())
}
}
}

Expand Down
10 changes: 8 additions & 2 deletions rust/tw_keypair/src/ed25519/modifications/cardano/extended_private.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,13 @@ impl<H: Hasher512> ExtendedPrivateKey<H> {
}

/// `ed25519` signing uses a public key associated with the private key.
pub(crate) fn sign_with_public_key(
///
/// # Unsafe
///
/// Ensure that the public key is always correctly paired with the private key,
/// preventing scenarios where an arbitrary public key could be introduced into the signing process.
/// Security report: https://github.com/trustwallet/wallet-core/security/advisories/GHSA-7g72-jxww-q9vq
satoshiotomakan marked this conversation as resolved.
Show resolved Hide resolved
pub(crate) unsafe fn sign_with_public_key(
&self,
public: &ExtendedPublicKey<H>,
message: &[u8],
Expand All @@ -61,7 +67,7 @@ impl<H: Hasher512> SigningKeyTrait for ExtendedPrivateKey<H> {
type Signature = Signature;

fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
self.sign_with_public_key(&self.public(), message.as_slice())
unsafe { self.sign_with_public_key(&self.public(), message.as_slice()) }
}
}

Expand Down
6 changes: 4 additions & 2 deletions rust/tw_keypair/src/ed25519/private.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ impl<H: Hasher512> PrivateKey<H> {
public: &PublicKey<H>,
message: &[u8],
) -> KeyPairResult<Signature> {
self.expanded_key
.sign_with_pubkey(public.to_bytes(), message)
unsafe {
self.expanded_key
.sign_with_pubkey(public.to_bytes(), message)
}
}
}

Expand Down
10 changes: 8 additions & 2 deletions rust/tw_keypair/src/ed25519/secret.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,14 @@ impl<H: Hasher512> ExpandedSecretKey<H> {
/// Signs a message with this `ExpandedSecretKey`.
/// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/secret.rs#L389-L412
/// Ported: https://github.com/trustwallet/wallet-core/blob/423f0e34725f69c0a9d535e1a32534c99682edea/trezor-crypto/crypto/ed25519-donna/ed25519.c#L97-L130
///
/// # Unsafe
///
/// Ensure that the public key is always correctly paired with the private key,
/// preventing scenarios where an arbitrary public key could be introduced into the signing process.
/// Security report: https://github.com/trustwallet/wallet-core/security/advisories/GHSA-7g72-jxww-q9vq
#[allow(non_snake_case)]
pub(crate) fn sign_with_pubkey(
pub(crate) unsafe fn sign_with_pubkey(
&self,
pubkey: H256,
message: &[u8],
Expand Down Expand Up @@ -122,7 +128,7 @@ mod tests {
let message = hex::decode("f0").unwrap();

// Anyway, the result signature has an expected value.
let sign = secret_key.sign_with_pubkey(public, &message).unwrap();
let sign = unsafe { secret_key.sign_with_pubkey(public, &message).unwrap() };
let expected = H512::from("ed55bce14a845a275e7a3a7242420ed1eeaba79dc3141bebf42ca0d12169e209a6e56b6981a336f711ae3aaea8d063b72b0e79a8808311d08cb42cabfdd0450d");
assert_eq!(sign.to_bytes(), expected);
}
Expand Down
Loading