Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ p256 = { version = "=0.13.0-pre", default-features = false, features = [
"hash2curve",
"voprf",
] }
p384 = { version = "=0.13.0-pre", default-features = false, features = [
"hash2curve",
"voprf",
] }
proptest = "1"
rand = "0.8"
regex = "1"
Expand All @@ -62,3 +66,4 @@ targets = []

[patch.crates-io]
p256 = { git = "https://github.com/RustCrypto/elliptic-curves", rev = "136fed7944d53c0508b1a93cd97bdab46891bcf7" }
p384 = { git = "https://github.com/RustCrypto/elliptic-curves", rev = "136fed7944d53c0508b1a93cd97bdab46891bcf7" }
4 changes: 4 additions & 0 deletions src/group/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use crate::{Error, Group, Result};
#[test]
fn test_group_properties() -> Result<()> {
use p256::NistP256;
use p384::NistP384;

#[cfg(feature = "ristretto255")]
{
Expand All @@ -27,6 +28,9 @@ fn test_group_properties() -> Result<()> {
test_identity_element_error::<NistP256>()?;
test_zero_scalar_error::<NistP256>()?;

test_identity_element_error::<NistP384>()?;
test_zero_scalar_error::<NistP384>()?;

Ok(())
}

Expand Down
8 changes: 8 additions & 0 deletions src/oprf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ mod tests {
#[test]
fn test_functionality() -> Result<()> {
use p256::NistP256;
use p384::NistP384;

#[cfg(feature = "ristretto255")]
{
Expand All @@ -445,6 +446,13 @@ mod tests {
zeroize_oprf_client::<NistP256>();
zeroize_oprf_server::<NistP256>();

base_retrieval::<NistP384>();
base_inversion_unsalted::<NistP384>();
server_evaluate::<NistP384>();

zeroize_oprf_client::<NistP384>();
zeroize_oprf_server::<NistP384>();

Ok(())
}
}
8 changes: 8 additions & 0 deletions src/poprf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,7 @@ mod tests {
#[test]
fn test_functionality() -> Result<()> {
use p256::NistP256;
use p384::NistP384;

#[cfg(feature = "ristretto255")]
{
Expand All @@ -985,6 +986,13 @@ mod tests {
zeroize_verifiable_client::<NistP256>();
zeroize_verifiable_server::<NistP256>();

verifiable_retrieval::<NistP384>();
verifiable_bad_public_key::<NistP384>();
verifiable_server_evaluate::<NistP384>();

zeroize_verifiable_client::<NistP384>();
zeroize_verifiable_server::<NistP384>();

Ok(())
}
}
1 change: 1 addition & 0 deletions src/serialization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ mod test {
}

let _ = $item::<p256::NistP256>::deserialize(&$bytes[..]);
let _ = $item::<p384::NistP384>::deserialize(&$bytes[..]);
};
}

Expand Down
28 changes: 28 additions & 0 deletions src/tests/test_cfrg_vectors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ macro_rules! json_to_test_vectors {
#[test]
fn test_vectors() -> Result<()> {
use p256::NistP256;
use p384::NistP384;

let rfc: Value = serde_json::from_str(rfc_to_json(super::cfrg_vectors::VECTORS).as_str())
.expect("Could not parse json");
Expand Down Expand Up @@ -159,6 +160,33 @@ fn test_vectors() -> Result<()> {
test_poprf_finalize::<NistP256>(&p256_poprf_tvs)?;
test_poprf_evaluate::<NistP256>(&p256_poprf_tvs)?;

let p384_oprf_tvs =
json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("OPRF"));
assert_ne!(p384_oprf_tvs.len(), 0);
test_oprf_seed_to_key::<NistP384>(&p384_oprf_tvs)?;
test_oprf_blind::<NistP384>(&p384_oprf_tvs)?;
test_oprf_blind_evaluate::<NistP384>(&p384_oprf_tvs)?;
test_oprf_finalize::<NistP384>(&p384_oprf_tvs)?;
test_oprf_evaluate::<NistP384>(&p384_oprf_tvs)?;

let p384_voprf_tvs =
json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("VOPRF"));
assert_ne!(p384_voprf_tvs.len(), 0);
test_voprf_seed_to_key::<NistP384>(&p384_voprf_tvs)?;
test_voprf_blind::<NistP384>(&p384_voprf_tvs)?;
test_voprf_blind_evaluate::<NistP384>(&p384_voprf_tvs)?;
test_voprf_finalize::<NistP384>(&p384_voprf_tvs)?;
test_voprf_evaluate::<NistP384>(&p384_voprf_tvs)?;

let p384_poprf_tvs =
json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("POPRF"));
assert_ne!(p384_poprf_tvs.len(), 0);
test_poprf_seed_to_key::<NistP384>(&p384_poprf_tvs)?;
test_poprf_blind::<NistP384>(&p384_poprf_tvs)?;
test_poprf_blind_evaluate::<NistP384>(&p384_poprf_tvs)?;
test_poprf_finalize::<NistP384>(&p384_poprf_tvs)?;
test_poprf_evaluate::<NistP384>(&p384_poprf_tvs)?;

Ok(())
}

Expand Down
10 changes: 10 additions & 0 deletions src/voprf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ mod tests {
#[test]
fn test_functionality() -> Result<()> {
use p256::NistP256;
use p384::NistP384;

#[cfg(feature = "ristretto255")]
{
Expand All @@ -858,6 +859,15 @@ mod tests {
zeroize_voprf_client::<NistP256>();
zeroize_voprf_server::<NistP256>();

verifiable_retrieval::<NistP384>();
verifiable_batch_retrieval::<NistP384>();
verifiable_bad_public_key::<NistP384>();
verifiable_batch_bad_public_key::<NistP384>();
verifiable_server_evaluate::<NistP384>();

zeroize_voprf_client::<NistP384>();
zeroize_voprf_server::<NistP384>();

Ok(())
}
}