saymrwulf/risc0-curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/risc0-curve25519-dalek-source.git synced 2026-09-04 20:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Aeneas-compat: rename verify params signature->sig (namespace shadowing)

Browse source 
The extractor's generated Lean would otherwise shadow the signature:: crate
namespace with the parameter binder, turning module paths into invalid field
projections. Pure rename.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
mrwulf 2026-07-04 18:00:28 +02:00
parent 67f588cd42
commit f6007690f5
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ed25519-dalek/src/verifying.rs
View file

@ -716,32 +716,34 @@ pub(crate) fn sha512_finalize_bytes(h: Sha512) -> [u8; 64] {
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub(crate) fn recompute_r_sha512( pub(crate) fn recompute_r_sha512(
key: &VerifyingKey, key: &VerifyingKey,
signature: &InternalSignature, sig: &InternalSignature,
message: &[u8], message: &[u8],
) -> CompressedEdwardsY { ) -> CompressedEdwardsY {
let mut h = sha512_new(); let mut h = sha512_new();
sha512_update(&mut h, signature.R.as_bytes()); sha512_update(&mut h, sig.R.as_bytes());
sha512_update(&mut h, key.compressed.as_bytes()); sha512_update(&mut h, key.compressed.as_bytes());
sha512_update(&mut h, message); sha512_update(&mut h, message);
let k = Scalar::from_bytes_mod_order_wide(&sha512_finalize_bytes(h)); let k = Scalar::from_bytes_mod_order_wide(&sha512_finalize_bytes(h));
let minus_A: EdwardsPoint = -key.point; let minus_A: EdwardsPoint = -key.point;
EdwardsPoint::vartime_double_scalar_mul_basepoint(&k, &minus_A, &signature.s).compress() EdwardsPoint::vartime_double_scalar_mul_basepoint(&k, &minus_A, &sig.s).compress()
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub(crate) fn verify_sha512( pub(crate) fn verify_sha512(
key: &VerifyingKey, key: &VerifyingKey,
message: &[u8], message: &[u8],
signature: &ed25519::Signature, sig: &ed25519::Signature,
) -> Result<(), SignatureError> { ) -> Result<(), SignatureError> {
let signature = InternalSignature::try_from(signature)?; // (parameter named `sig`, not `signature`: the extractor's generated
let expected_R = recompute_r_sha512(key, &signature, message); // code would otherwise shadow the `signature::` crate namespace)
let sig = InternalSignature::try_from(sig)?;
let expected_R = recompute_r_sha512(key, &sig, message);
// AENEAS-COMPAT: explicit byte comparison (the derived PartialEq routes // AENEAS-COMPAT: explicit byte comparison (the derived PartialEq routes
// through machinery the extractor cannot interpret). Semantics identical // through machinery the extractor cannot interpret). Semantics identical
// to `expected_R == signature.R`. // to `expected_R == signature.R`.
let e = expected_R.as_bytes(); let e = expected_R.as_bytes();
let r = signature.R.as_bytes(); let r = sig.R.as_bytes();
let mut equal = true; let mut equal = true;
let mut i = 0; let mut i = 0;
while i < 32 { while i < 32 {