Skip to content

fix: couple bugs #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sinui0 merged 3 commits into from
Jan 13, 2026
Merged

fix: couple bugs #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b737f7b
fix(garble): mac commitment bug
sinui0 Jan 13, 2026
4875423
Revert "feat(garble-core): randomize gate id and cipher key (#348)"
sinui0 Jan 13, 2026
3641216
fix(zk): zero out PRG position
sinui0 Jan 13, 2026
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
35 changes: 9 additions & 26 deletions crates/garble-core/benches/evaluate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ fn bench_evaluate(c: &mut Criterion) {

let mut rng = StdRng::seed_from_u64(0);
let delta = Delta::random(&mut rng);
let seed: [u8; 16] = rng.random();

// Prepare inputs
let inputs: Vec<Key> = (0..256).map(|_| rng.random()).collect();
Expand All @@ -38,12 +37,10 @@ fn bench_evaluate(c: &mut Criterion) {
let actual_gates = iterations as u64 * gates_per_circuit;

// Pre-generate garbled circuits (single gates)
let mut gb = Garbler::new(seed, delta);
let setup = gb.setup().unwrap();
let mut gb = Garbler::default();
let all_gates: Vec<Vec<_>> = (0..iterations)
.map(|_| {
let worker = gb.alloc_worker(circuit.and_count()).unwrap();
let mut iter = worker.generate(circuit, &inputs).unwrap();
let mut iter = gb.generate(circuit, delta, &inputs).unwrap();
let gates: Vec<_> = iter.by_ref().collect();
let _ = iter.finish().unwrap();
gates
Expand All @@ -55,11 +52,9 @@ fn bench_evaluate(c: &mut Criterion) {
// Iterator-based (one gate at a time)
group.bench_function(BenchmarkId::new("iter", name), |b| {
let mut ev = Evaluator::default();
ev.setup(setup.clone()).unwrap();
b.iter(|| {
for gates in &all_gates {
let worker = ev.alloc_worker(circuit.and_count()).unwrap();
let mut consumer = worker.evaluate(circuit, &eval_inputs).unwrap();
let mut consumer = ev.evaluate(circuit, &eval_inputs).unwrap();
for gate in gates {
consumer.next(*gate);
}
Expand All @@ -73,19 +68,15 @@ fn bench_evaluate(c: &mut Criterion) {
// iteration
group.bench_function(BenchmarkId::new("batched", name), |b| {
let mut ev = Evaluator::default();
ev.setup(setup.clone()).unwrap();
let mut gb = Garbler::new(seed, delta);
let _ = gb.setup().unwrap();
let mut gb = Garbler::default();
b.iter(|| {
for _ in 0..iterations {
// Regenerate batches (not timed separately, but included in measurement)
let worker = gb.alloc_worker(circuit.and_count()).unwrap();
let mut iter = worker.generate_batched(circuit, &inputs).unwrap();
let mut iter = gb.generate_batched(circuit, delta, &inputs).unwrap();
let batches: Vec<_> = iter.by_ref().collect();
let _ = iter.finish().unwrap();

let ev_worker = ev.alloc_worker(circuit.and_count()).unwrap();
let mut consumer = ev_worker.evaluate_batched(circuit, &eval_inputs).unwrap();
let mut consumer = ev.evaluate_batched(circuit, &eval_inputs).unwrap();
for batch in batches {
consumer.next(batch);
}
Expand All @@ -105,7 +96,6 @@ fn bench_evaluate_parallel(c: &mut Criterion) {

let mut rng = StdRng::seed_from_u64(0);
let delta = Delta::random(&mut rng);
let seed: [u8; 16] = rng.random();

// Prepare inputs
let inputs: Vec<Key> = (0..256).map(|_| rng.random()).collect();
Expand All @@ -123,12 +113,10 @@ fn bench_evaluate_parallel(c: &mut Criterion) {
let actual_gates = circuit_count as u64 * gates_per_circuit;

// Pre-garble circuits
let mut gb = Garbler::new(seed, delta);
let setup = gb.setup().unwrap();
let mut gb = Garbler::default();
let garbled_circuits: Vec<GarbledCircuit> = (0..circuit_count)
.map(|_| {
let worker = gb.alloc_worker(circuit.and_count()).unwrap();
let mut iter = worker.generate(&circuit, &inputs).unwrap();
let mut iter = gb.generate(&circuit, delta, &inputs).unwrap();
let gates: Vec<_> = iter.by_ref().collect();
let _ = iter.finish().unwrap();
GarbledCircuit { gates }
Expand All @@ -139,17 +127,12 @@ fn bench_evaluate_parallel(c: &mut Criterion) {

// Parallel evaluation using evaluate_garbled_circuits (uses rayon par_iter)
group.bench_function(BenchmarkId::new("rayon", name), |b| {
let mut ev = Evaluator::default();
ev.setup(setup.clone()).unwrap();
b.iter(|| {
let circs: Vec<_> = garbled_circuits
.iter()
.map(|gc| (circuit.clone(), eval_inputs.clone(), gc.clone()))
.collect();
let workers: Vec<_> = (0..circuit_count)
.map(|_| ev.alloc_worker(circuit.and_count()).unwrap())
.collect();
black_box(evaluate_garbled_circuits(circs, workers).unwrap())
black_box(evaluate_garbled_circuits(circs).unwrap())
})
});
}
Expand Down
45 changes: 5 additions & 40 deletions crates/garble-core/benches/garble.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use criterion::{BenchmarkId, Criterion, Throughput, black_box, criterion_group, criterion_main};
use mpz_circuits::AES128;
use mpz_garble_core::{Evaluator, Garbler, Key};
use mpz_garble_core::{Garbler, Key};
use mpz_memory_core::correlated::Delta;
use rand::{Rng, SeedableRng, rngs::StdRng};

Expand All @@ -19,7 +19,6 @@ fn bench_garble(c: &mut Criterion) {
let mut rng = StdRng::seed_from_u64(0);
let delta = Delta::random(&mut rng);
let inputs: Vec<Key> = (0..256).map(|_| rng.random()).collect();
let seed: [u8; 16] = rng.random();

let gates_per_circuit = circuit.and_count() as u64;

Expand All @@ -31,11 +30,10 @@ fn bench_garble(c: &mut Criterion) {

// Iterator-based (one gate at a time)
group.bench_function(BenchmarkId::new("iter", name), |b| {
let mut gb = Garbler::default();
b.iter(|| {
for _ in 0..iterations {
let mut gb = Garbler::new(seed, delta);
let _ = gb.setup().unwrap();
let mut iter = gb.generate(circuit, &inputs).unwrap();
let mut iter = gb.generate(circuit, delta, &inputs).unwrap();
let _: Vec<_> = iter.by_ref().collect();
black_box(iter.finish().unwrap());
}
Expand All @@ -44,11 +42,10 @@ fn bench_garble(c: &mut Criterion) {

// Batched (multiple gates at a time)
group.bench_function(BenchmarkId::new("batched", name), |b| {
let mut gb = Garbler::default();
b.iter(|| {
for _ in 0..iterations {
let mut gb = Garbler::new(seed, delta);
let _ = gb.setup().unwrap();
let mut iter = gb.generate_batched(circuit, &inputs).unwrap();
let mut iter = gb.generate_batched(circuit, delta, &inputs).unwrap();
let _: Vec<_> = iter.by_ref().collect();
black_box(iter.finish().unwrap());
}
Expand All @@ -57,38 +54,6 @@ fn bench_garble(c: &mut Criterion) {
}

group.finish();

// Evaluator benchmarks
let mut ev_group = c.benchmark_group("evaluate");

ev_group.bench_function("aes128", |b| {
let mut gb = Garbler::new(seed, delta);
let setup = gb.setup().unwrap();
let mut gb_iter = gb.generate(&AES128, &inputs).unwrap();
let gates: Vec<_> = gb_iter.by_ref().collect();

let choices: Vec<bool> = (0..256).map(|_| rng.random()).collect();
let inputs: Vec<_> = inputs
.iter()
.zip(choices)
.map(|(input, choice)| input.auth(choice, &delta))
.collect();

b.iter(|| {
let setup = setup.clone();
let mut ev = Evaluator::default();
ev.setup(setup).unwrap();
let mut ev_consumer = ev.evaluate(&AES128, &inputs).unwrap();

for gate in &gates {
ev_consumer.next(*gate);
}

black_box(ev_consumer.finish().unwrap());
})
});

ev_group.finish();
}

criterion_group!(benches, bench_garble);
Expand Down
Loading
Loading