From d1fbc26f1ff4d82a7d27b5e062f95ce0b89c503d Mon Sep 17 00:00:00 2001 From: Peter Rindal Date: Mon, 3 Mar 2025 08:46:53 -0800 Subject: [PATCH] fix test and rename variables --- frontend/benchmark.h | 32 ++++++++++++++++---------------- libOTe_Tests/SilentOT_Tests.cpp | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/frontend/benchmark.h b/frontend/benchmark.h index 9312614..30b5eb5 100644 --- a/frontend/benchmark.h +++ b/frontend/benchmark.h @@ -933,19 +933,19 @@ namespace osuCrypto } std::vector - A0(blocks), - A1(blocks), - B0(blocks), - B1(blocks), - C0(blocks), - C1(blocks); + Av0(blocks), + Av1(blocks), + Bv0(blocks), + Bv1(blocks), + Cv0(blocks), + Cv1(blocks); oles[0].setTimer(timer); auto b = timer.setTimePoint("start"); auto r = macoro::sync_wait(macoro::when_all_ready( - oles[0].expand(A0,B0,C0, prng0, sock[0]) | macoro::start_on(pool), - oles[1].expand(A1,B1,C1, prng1, sock[1]) | macoro::start_on(pool))); + oles[0].expand(Av0,Bv0,Cv0, prng0, sock[0]) | macoro::start_on(pool), + oles[1].expand(Av1,Bv1,Cv1, prng1, sock[1]) | macoro::start_on(pool))); auto e=timer.setTimePoint("end"); tps = double(n) / (std::chrono::duration_cast(e - b).count() / 1000.0); std::get<0>(r).result(); @@ -1026,19 +1026,19 @@ namespace osuCrypto } std::vector - A0(blocks), - A1(blocks), - B0(blocks), - B1(blocks), - C0(blocks), - C1(blocks); + Av0(blocks), + Av1(blocks), + Bv0(blocks), + Bv1(blocks), + Cv0(blocks), + Cv1(blocks); oles[0].setTimer(timer); auto b = timer.setTimePoint("start"); auto r = macoro::sync_wait(macoro::when_all_ready( - oles[0].expand(A0, B0, C0, prng0, sock[0]) | macoro::start_on(pool), - oles[1].expand(A1, B1, C1, prng1, sock[1]) | macoro::start_on(pool))); + oles[0].expand(Av0, Bv0, Cv0, prng0, sock[0]) | macoro::start_on(pool), + oles[1].expand(Av1, Bv1, Cv1, prng1, sock[1]) | macoro::start_on(pool))); auto e = timer.setTimePoint("end"); tps = double(n) / (std::chrono::duration_cast(e - b).count() / 1000.0); std::get<0>(r).result(); diff --git a/libOTe_Tests/SilentOT_Tests.cpp b/libOTe_Tests/SilentOT_Tests.cpp index b937c56..72ae95c 100644 --- a/libOTe_Tests/SilentOT_Tests.cpp +++ b/libOTe_Tests/SilentOT_Tests.cpp @@ -420,8 +420,8 @@ void SilentOtTriple_triple_test(const oc::CLP& cmd) PRNG prng1(block(6474567454546, 567546754674345444)); Timer timer; - oles[0].init(0, n, SilentSecType::SemiHonest, SilentOtTriple::Type::OLE); - oles[1].init(1, n, SilentSecType::SemiHonest, SilentOtTriple::Type::OLE); + oles[0].init(0, n, SilentSecType::SemiHonest, SilentOtTriple::Type::Triple); + oles[1].init(1, n, SilentSecType::SemiHonest, SilentOtTriple::Type::Triple); { auto otCount0 = oles[0].baseOtCount(prng0); @@ -454,17 +454,17 @@ void SilentOtTriple_triple_test(const oc::CLP& cmd) auto sock = coproto::LocalAsyncSocket::makePair(); std::vector - A0(blocks), - A1(blocks), - B0(blocks), - B1(blocks), - C0(blocks), - C1(blocks); + Av0(blocks), + Av1(blocks), + Bv0(blocks), + Bv1(blocks), + Cv0(blocks), + Cv1(blocks); auto r = macoro::sync_wait(macoro::when_all_ready( - oles[0].expand(A0, B0, C0, prng0, sock[0]), - oles[1].expand(A1, B1, C1, prng1, sock[1]))); + oles[0].expand(Av0, Bv0, Cv0, prng0, sock[0]), + oles[1].expand(Av1, Bv1, Cv1, prng1, sock[1]))); std::get<0>(r).result(); std::get<1>(r).result(); @@ -472,8 +472,8 @@ void SilentOtTriple_triple_test(const oc::CLP& cmd) // the test otherwise. for (size_t i = 0; i < blocks; i++) { - auto act = C0[i] ^ C1[i]; - auto exp = (A0[i]^A1[i]) & (B0[i] ^ B1[i]); + auto act = Cv0[i] ^ Cv1[i]; + auto exp = (Av0[i]^Av1[i]) & (Bv0[i] ^ Bv1[i]); if (act != exp) {