fix benchmarks

This commit is contained in:
François Garillot
2020-09-03 15:54:46 -04:00
parent 48412c8ee4
commit 81353cb844
2 changed files with 8 additions and 6 deletions
+5 -3
View File
@@ -15,6 +15,7 @@ use opaque_ke::{
oprf::{generate_oprf1_shim, generate_oprf2_shim, generate_oprf3_shim, OprfClientBytes}, oprf::{generate_oprf1_shim, generate_oprf2_shim, generate_oprf3_shim, OprfClientBytes},
}; };
use rand::{prelude::ThreadRng, thread_rng}; use rand::{prelude::ThreadRng, thread_rng};
use sha2::Sha256;
fn oprf1(c: &mut Criterion) { fn oprf1(c: &mut Criterion) {
let mut csprng: ThreadRng = thread_rng(); let mut csprng: ThreadRng = thread_rng();
@@ -103,8 +104,8 @@ fn oprf3(c: &mut Criterion) {
c.bench_function("generate_oprf3 with Ristretto", move |b| { c.bench_function("generate_oprf3 with Ristretto", move |b| {
b.iter(|| { b.iter(|| {
let _res = let _res = generate_oprf3_shim::<RistrettoPoint, Sha256>(input, beta, &blinding_factor)
generate_oprf3_shim::<RistrettoPoint>(input, beta, &blinding_factor).unwrap(); .unwrap();
}) })
}); });
} }
@@ -126,7 +127,8 @@ fn oprf3_edwards(c: &mut Criterion) {
c.bench_function("generate_oprf3 with Edwards", move |b| { c.bench_function("generate_oprf3 with Edwards", move |b| {
b.iter(|| { b.iter(|| {
let _res = generate_oprf3_shim::<EdwardsPoint>(input, beta, &blinding_factor).unwrap(); let _res =
generate_oprf3_shim::<EdwardsPoint, Sha256>(input, beta, &blinding_factor).unwrap();
}) })
}); });
} }
+3 -3
View File
@@ -78,12 +78,12 @@ pub fn generate_oprf2_shim<G: Group>(
#[cfg(feature = "bench")] #[cfg(feature = "bench")]
#[inline] #[inline]
pub fn generate_oprf3_shim<G: Group>( pub fn generate_oprf3_shim<G: Group, H: Hash>(
input: &[u8], input: &[u8],
point: G, point: G,
blinding_factor: &G::Scalar, blinding_factor: &G::Scalar,
) -> Result<GenericArray<u8, U32>, InternalPakeError> { ) -> Result<GenericArray<u8, <H as Digest>::OutputSize>, InternalPakeError> {
generate_oprf3(input, point, blinding_factor) generate_oprf3::<G, H>(input, point, blinding_factor)
} }
// Tests // Tests