zec
/
mpc
mirror of https://github.com/zcash/mpc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor well-formedness checks.

This commit is contained in:
Sean Bowe 2016-09-19 19:18:35 -06:00
parent 82c90ad2de
commit 32d3db8421
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/protocol/secrets.rs
View File

@ -28,6 +28,10 @@ pub struct PublicKey {
impl PublicKey { impl PublicKey {
fn is_valid(&self) -> bool { fn is_valid(&self) -> bool {
self.is_well_formed()
}
fn is_well_formed(&self) -> bool {
!self.f1.is_zero() && !self.f1.is_zero() &&
!self.f1_rho_a.is_zero() && !self.f1_rho_a.is_zero() &&
!self.f1_rho_a_alpha_a.is_zero() && !self.f1_rho_a_alpha_a.is_zero() &&
@ -312,7 +316,7 @@ fn pubkey_consistency() {
// changed, which makes for a good consistency check // changed, which makes for a good consistency check
// of the code. // of the code.
fn breaks_validity<F: for<'a> Fn(&'a mut PublicKey) -> &'a mut G2>( fn breaks_wf<F: for<'a> Fn(&'a mut PublicKey) -> &'a mut G2>(
pubkey: &PublicKey, pubkey: &PublicKey,
f: F, f: F,
expected: bool expected: bool
@ -326,7 +330,7 @@ fn pubkey_consistency() {
*change = *change + *change; *change = *change + *change;
} }
assert!(pubkey.is_valid() == !expected); assert!(pubkey.is_well_formed() == !expected);
} }
let rng = &mut ::rand::thread_rng(); let rng = &mut ::rand::thread_rng();
@ -336,20 +340,20 @@ fn pubkey_consistency() {
assert!(pubkey.is_valid()); assert!(pubkey.is_valid());
breaks_validity(&pubkey, |p| &mut p.f1, true); breaks_wf(&pubkey, |p| &mut p.f1, true);
breaks_validity(&pubkey, |p| &mut p.f1_rho_a, true); breaks_wf(&pubkey, |p| &mut p.f1_rho_a, true);
breaks_validity(&pubkey, |p| &mut p.f1_rho_a_alpha_a, true); breaks_wf(&pubkey, |p| &mut p.f1_rho_a_alpha_a, true);
breaks_validity(&pubkey, |p| &mut p.f1_rho_a_rho_b, true); breaks_wf(&pubkey, |p| &mut p.f1_rho_a_rho_b, true);
breaks_validity(&pubkey, |p| &mut p.f1_rho_a_rho_b_alpha_c, true); breaks_wf(&pubkey, |p| &mut p.f1_rho_a_rho_b_alpha_c, true);
breaks_validity(&pubkey, |p| &mut p.f2_beta, true); breaks_wf(&pubkey, |p| &mut p.f2_beta, true);
breaks_validity(&pubkey, |p| &mut p.f2_beta_gamma, true); breaks_wf(&pubkey, |p| &mut p.f2_beta_gamma, true);
// We only ever need beta (alone) in G2, so changing the // We only ever need beta (alone) in G2, so changing the
// relationship between f2 and f2_beta cannot be // relationship between f2 and f2_beta cannot be
// inconsistent // inconsistent
breaks_validity(&pubkey, |p| &mut p.f2, false); breaks_wf(&pubkey, |p| &mut p.f2, false);
// We only ever need alpha_b (alone) in G2 as well, so // We only ever need alpha_b (alone) in G2 as well, so
// f1_rho_a_rho_b_alpha_b cannot be inconsistent with other relationships // f1_rho_a_rho_b_alpha_b cannot be inconsistent with other relationships
breaks_validity(&pubkey, |p| &mut p.f1_rho_a_rho_b_alpha_b, false); breaks_wf(&pubkey, |p| &mut p.f1_rho_a_rho_b_alpha_b, false);
} }