Skip to content

Commit

Permalink
Revert "fix:Correct ECDSA signature malleability handling (#13544)"
Browse files Browse the repository at this point in the history
This reverts commit 6e4a3f9.
  • Loading branch information
alinush committed Jun 25, 2024
1 parent eef1404 commit 7387bcf
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
10 changes: 5 additions & 5 deletions crates/aptos-crypto/src/secp256r1_ecdsa/secp256r1_ecdsa_sigs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,23 @@ impl Signature {
if bytes.len() != SIGNATURE_LENGTH {
return Err(CryptoMaterialError::WrongLengthError);
}
if !Signature::check_s_le_order_half(&bytes[32..]) {
if !Signature::check_s_lt_order_half(&bytes[32..]) {
return Err(CryptoMaterialError::CanonicalRepresentationError);
}
Ok(())
}

/// Check if S <= ORDER_HALF to capture invalid signatures.
fn check_s_le_order_half(s: &[u8]) -> bool {
/// Check if S < ORDER_HALF to capture invalid signatures.
fn check_s_lt_order_half(s: &[u8]) -> bool {
for i in 0..32 {
match s[i].cmp(&ORDER_HALF[i]) {
Ordering::Less => return true,
Ordering::Greater => return false,
_ => {},
}
}
// At this stage S == ORDER_HALF , it is still considered a canonical value.
true
// At this stage S == ORDER_HALF which implies a non canonical S.
false
}

/// If the signature {R,S} does not have S < n/2 where n is the Ristretto255 order, return
Expand Down
10 changes: 6 additions & 4 deletions crates/aptos-crypto/src/unit_tests/secp256r1_ecdsa_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,13 @@ proptest! {
let sig_unchecked = Signature::from_bytes_unchecked(&serialized);
prop_assert!(sig_unchecked.is_ok());

// S = ORDER_HALF should be a canonical signature.
// Update the signature by setting S = L to make it invalid.
serialized[32..].copy_from_slice(&ORDER_HALF);
let canonical: &[u8] = &serialized;
prop_assert!(
Signature::try_from(canonical).is_ok()
let serialized_malleable_l: &[u8] = &serialized;
// try_from will fail with CanonicalRepresentationError.
prop_assert_eq!(
Signature::try_from(serialized_malleable_l),
Err(CryptoMaterialError::CanonicalRepresentationError)
);
}
}

0 comments on commit 7387bcf

Please sign in to comment.