vecna
/
lox
mirror of https://gitlab.torproject.org/vecna/lox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed comments from code review

This commit is contained in:
onyinyang 2021-05-18 14:46:35 -04:00
parent c73230e937
commit fd05dce77d
No known key found for this signature in database
GPG Key ID: 156A6435430C2036
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/lox-library/src/proto/open_invite.rs
View File

@ -22,7 +22,8 @@ use zkp::CompactProof;
use zkp::ProofError; use zkp::ProofError;
use zkp::Transcript; use zkp::Transcript;
use super::super::{{bridge_table, BridgeLine}}; use super::super::bridge_table;
use super::super::bridge_table::BridgeLine;
use super::super::cred; use super::super::cred;
use super::super::dup_filter::SeenType; use super::super::dup_filter::SeenType;
use super::super::OPENINV_LENGTH; use super::super::OPENINV_LENGTH;
@ -190,8 +191,7 @@ impl BridgeAuth {
// of the bucket id (u32) and the bucket's decryption key ([u8; 16]) // of the bucket id (u32) and the bucket's decryption key ([u8; 16])
let bucket_key = self.bridge_table.keys[bucket_id]; let bucket_key = self.bridge_table.keys[bucket_id];
let bucket: Scalar = bridge_table::to_scalar(bucket_id_u32, &bucket_key); let bucket: Scalar = bridge_table::to_scalar(bucket_id_u32, &bucket_key);
let pre_line = self.bridge_table.decrypt_bucket_id(bucket_id_u32, &bucket_key).unwrap().0; let bridge_line = self.bridge_table.buckets[bucket_id][0];
let bridge_line: BridgeLine = pre_line[0];
// Create the level_since attribute (Scalar), which is today's // Create the level_since attribute (Scalar), which is today's
// Julian date // Julian date
@ -267,7 +267,7 @@ pub fn handle_response(
state: State, state: State,
resp: Response, resp: Response,
lox_pub: &IssuerPubKey, lox_pub: &IssuerPubKey,
) -> Result<(cred::Lox, bridge_table::BridgeLine), ProofError> { ) -> Result<(cred::Lox, BridgeLine), ProofError> {
let A: &RistrettoPoint = &CMZ_A; let A: &RistrettoPoint = &CMZ_A;
let B: &RistrettoPoint = &CMZ_B; let B: &RistrettoPoint = &CMZ_B;
let Btable: &RistrettoBasepointTable = &CMZ_B_TABLE; let Btable: &RistrettoBasepointTable = &CMZ_B_TABLE;
@ -311,7 +311,8 @@ pub fn handle_response(
// Decrypt EncQ // Decrypt EncQ
let Q = resp.EncQ.1 - (state.d * resp.EncQ.0); let Q = resp.EncQ.1 - (state.d * resp.EncQ.0);
Ok((cred::Lox { Ok((
cred::Lox {
P: resp.P, P: resp.P,
Q, Q,
id, id,

4
crates/lox-library/src/tests.rs
View File

@ -141,7 +141,7 @@ fn test_open_invite() {
let mut th = TestHarness::new(); let mut th = TestHarness::new();
// Join an untrusted user // Join an untrusted user
let cred = th.open_invite().0; let (cred, bridgeline) = th.open_invite();
// Check that we can use the credential to read a bucket // Check that we can use the credential to read a bucket
let (id, key) = bridge_table::from_scalar(cred.bucket).unwrap(); let (id, key) = bridge_table::from_scalar(cred.bucket).unwrap();
@ -150,8 +150,10 @@ fn test_open_invite() {
bridge_table::BridgeTable::decrypt_bucket(id, &key, &encbuckets[id as usize]).unwrap(); bridge_table::BridgeTable::decrypt_bucket(id, &key, &encbuckets[id as usize]).unwrap();
println!("cred = {:?}", cred); println!("cred = {:?}", cred);
println!("bucket = {:?}", bucket); println!("bucket = {:?}", bucket);
println!("bridgeline = {:?}", bridgeline);
assert!(bucket.1.is_none()); assert!(bucket.1.is_none());
assert!(th.ba.verify_lox(&cred)); assert!(th.ba.verify_lox(&cred));
assert!(bridgeline == bucket.0[0]);
} }
#[test] #[test]