Don't recompute H when verifying positive reports

This commit is contained in:
Vecna 2024-02-28 11:57:48 -05:00
parent c1b058ce4e
commit d06542f99c
1 changed files with 4 additions and 6 deletions

View File

@ -3,12 +3,11 @@
use crate::{get_date, CONFIG, COUNTRY_CODES}; use crate::{get_date, CONFIG, COUNTRY_CODES};
use curve25519_dalek::{RistrettoPoint, Scalar}; use curve25519_dalek::{ristretto::RistrettoBasepointTable, Scalar};
use ed25519_dalek::{Signature, Signer, SigningKey, Verifier, VerifyingKey}; use ed25519_dalek::{Signature, Signer, SigningKey, Verifier, VerifyingKey};
use lox_library::{cred::Lox, proto::positive_report as lox_pr, IssuerPubKey}; use lox_library::{cred::Lox, proto::positive_report as lox_pr, IssuerPubKey};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use sha1::{Digest, Sha1}; use sha1::{Digest, Sha1};
use sha2::Sha512;
use std::option::Option; use std::option::Option;
#[derive(Debug)] #[derive(Debug)]
@ -106,12 +105,14 @@ impl PositiveReport {
/// Verify everything except the Lox proof. /// Verify everything except the Lox proof.
/// Parameters: /// Parameters:
/// - The bucket ID for the bucket containing this bridge /// - The bucket ID for the bucket containing this bridge
/// - A basepoint table for computing multiples of H
/// - The bridge verifying key for this bridge (if bridge token is required) /// - The bridge verifying key for this bridge (if bridge token is required)
/// These parameters are assumed to be correct and are NOT checked against /// These parameters are assumed to be correct and are NOT checked against
/// the fingerprint listed in the report. /// the fingerprint listed in the report.
pub fn verify_excluding_lox_proof( pub fn verify_excluding_lox_proof(
self, self,
bucket: Scalar, bucket: Scalar,
Htable: &RistrettoBasepointTable,
bridge_key: Option<VerifyingKey>, bridge_key: Option<VerifyingKey>,
) -> bool { ) -> bool {
// Verify bridge token // Verify bridge token
@ -132,11 +133,8 @@ impl PositiveReport {
} }
} }
// Verify knowledge of bucket ID // Verify knowledge of bucket ID
let H = RistrettoPoint::hash_from_bytes::<Sha512>(
format!("{}{}", lox_pr::H_GENERATOR_STRING, self.lox_proof.date).as_bytes(),
);
let BP = self.lox_proof.BP; let BP = self.lox_proof.BP;
if bucket * H != BP { if &bucket * Htable != BP {
return false; return false;
} }
true true