Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-07-26 08:15:35 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't take Rings by value if we don't consume them

Browse source
This commit is contained in:
Thomas Eizinger 2021-05-11 12:40:37 +10:00
parent 6a4961a472
commit f9cac4b6c9
No known key found for this signature in database
GPG key ID: 651AC83A6C6C8B96
2 changed files with 50 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

45
monero-adaptor/src/clsag.rs
View file

@ -17,8 +17,8 @@ pub fn sign(
signing_key: Scalar, signing_key: Scalar,
H_p_pk: EdwardsPoint, H_p_pk: EdwardsPoint,
alpha: Scalar, alpha: Scalar,
ring: Ring, ring: &Ring,
commitment_ring: Ring, commitment_ring: &Ring,
fake_responses: [Scalar; RING_SIZE - 1], fake_responses: [Scalar; RING_SIZE - 1],
z: Scalar, z: Scalar,
pseudo_output_commitment: EdwardsPoint, pseudo_output_commitment: EdwardsPoint,
@ -89,8 +89,14 @@ pub fn sign(
} }
#[must_use] #[must_use]
pub fn verify(sig: &Signature, msg: &[u8], ring: Ring, commitment_ring: Ring, pseudo_output_commitment: EdwardsPoint, H_p_pk: EdwardsPoint) -> bool { pub fn verify(
sig: &Signature,
msg: &[u8],
ring: &Ring,
commitment_ring: &Ring,
pseudo_output_commitment: EdwardsPoint,
H_p_pk: EdwardsPoint,
) -> bool {
let mus = AggregationHashes::new( let mus = AggregationHashes::new(
&ring, &ring,
&commitment_ring, &commitment_ring,
@ -103,7 +109,12 @@ pub fn verify(sig: &Signature, msg: &[u8], ring: Ring, commitment_ring: Ring, ps
for (i, s_i) in sig.responses.iter().enumerate() { for (i, s_i) in sig.responses.iter().enumerate() {
let pk_i = ring[(i + 1) % RING_SIZE]; let pk_i = ring[(i + 1) % RING_SIZE];
let prefix = clsag_round_hash_prefix(ring.as_ref(), commitment_ring.as_ref(), pseudo_output_commitment, msg); let prefix = clsag_round_hash_prefix(
ring.as_ref(),
commitment_ring.as_ref(),
pseudo_output_commitment,
msg,
);
let adjusted_commitment_i = commitment_ring[i] - pseudo_output_commitment; let adjusted_commitment_i = commitment_ring[i] - pseudo_output_commitment;
let L_i = compute_L(h, &mus, *s_i, pk_i, adjusted_commitment_i); let L_i = compute_L(h, &mus, *s_i, pk_i, adjusted_commitment_i);
@ -317,8 +328,28 @@ mod tests {
// TODO: document // TODO: document
let pseudo_output_commitment = commitment_ring[0]; let pseudo_output_commitment = commitment_ring[0];
let signature = sign(msg_to_sign, s_prime_a, todo!(), todo!(), ring.clone(), commitment_ring.clone(), todo!(), todo!(), pseudo_output_commitment, todo!(), todo!(), todo!()); let signature = sign(
msg_to_sign,
s_prime_a,
todo!(),
todo!(),
&ring,
&commitment_ring,
todo!(),
todo!(),
pseudo_output_commitment,
todo!(),
todo!(),
todo!(),
);
assert!(verify(&signature, msg_to_sign, ring, commitment_ring, pseudo_output_commitment, todo!())) assert!(verify(
&signature,
msg_to_sign,
&ring,
&commitment_ring,
pseudo_output_commitment,
todo!()
))
} }
} }

17
monero-adaptor/src/lib.rs
View file

@ -170,8 +170,8 @@ impl Alice0 {
self.s_prime_a, self.s_prime_a,
self.H_p_pk, self.H_p_pk,
self.alpha_a, self.alpha_a,
self.ring, &self.ring,
self.commitment_ring, &self.commitment_ring,
self.fake_responses, self.fake_responses,
z, z,
self.pseudo_output_commitment, self.pseudo_output_commitment,
@ -346,8 +346,8 @@ impl Bob1 {
self.s_b, self.s_b,
self.H_p_pk, self.H_p_pk,
self.alpha_b, self.alpha_b,
self.ring, &self.ring,
self.commitment_ring, &self.commitment_ring,
fake_responses, fake_responses,
z, z,
self.pseudo_output_commitment, self.pseudo_output_commitment,
@ -631,6 +631,13 @@ mod tests {
let sig = alice.adaptor_sig.adapt(r_a); let sig = alice.adaptor_sig.adapt(r_a);
assert!(clsag::verify(&sig, msg_to_sign, todo!(), todo!(), todo!(), todo!())); assert!(clsag::verify(
&sig,
msg_to_sign,
todo!(),
todo!(),
todo!(),
todo!()
));
} }
} }