From 7d9c84ba541a629079eba63b68e8665038908f7d Mon Sep 17 00:00:00 2001 From: Peter Rindal Date: Mon, 29 Apr 2024 15:16:08 -0700 Subject: [PATCH] warning and blake update --- cryptoTools | 2 +- frontend/benchmark.h | 2 +- libOTe/Tools/EACode/EAChecker.cpp | 3 ++- libOTe/Tools/Pprf/RegularPprf.h | 2 +- libOTe/TwoChooseOne/Iknp/IknpOtExtReceiver.cpp | 2 ++ libOTe/TwoChooseOne/Iknp/IknpOtExtSender.cpp | 4 ++++ libOTe/Vole/Noisy/NoisyVoleReceiver.h | 2 +- libOTe/Vole/Silent/SilentVoleReceiver.h | 2 +- libOTe/Vole/Silent/SilentVoleSender.h | 2 +- libOTe_Tests/ExConvCode_Tests.cpp | 10 +++++----- 10 files changed, 19 insertions(+), 12 deletions(-) diff --git a/cryptoTools b/cryptoTools index ca8b383..773cda0 160000 --- a/cryptoTools +++ b/cryptoTools @@ -1 +1 @@ -Subproject commit ca8b383fc27b104a8e3a6325ae83a8432ea4dfdb +Subproject commit 773cda0e06f4b7001028b445a850b17f1b909036 diff --git a/frontend/benchmark.h b/frontend/benchmark.h index f383812..40a812f 100644 --- a/frontend/benchmark.h +++ b/frontend/benchmark.h @@ -577,7 +577,7 @@ namespace osuCrypto for (u64 t = 0; t < trials; ++t) { auto p1 = recver.silentReceiveInplace(n, prng1, sock[1]); - char c; + char c=0; coproto::sync_wait(sock[1].send(std::move(c))); coproto::sync_wait(sock[1].recv(c)); diff --git a/libOTe/Tools/EACode/EAChecker.cpp b/libOTe/Tools/EACode/EAChecker.cpp index 2950f8f..74cf605 100644 --- a/libOTe/Tools/EACode/EAChecker.cpp +++ b/libOTe/Tools/EACode/EAChecker.cpp @@ -227,7 +227,8 @@ namespace osuCrypto if (d < minDis) { - ii = { { i } }; + ii.clear(); + ii.push_back( i ); for (u64 j = 0; j < ss.size() - 1; ++j) { if (jj & (1ull << j)) diff --git a/libOTe/Tools/Pprf/RegularPprf.h b/libOTe/Tools/Pprf/RegularPprf.h index c69e76e..c5cfb53 100644 --- a/libOTe/Tools/Pprf/RegularPprf.h +++ b/libOTe/Tools/Pprf/RegularPprf.h @@ -118,7 +118,7 @@ namespace osuCrypto pprf::validateExpandFormat(oFormat, output, mDomain, mPntCount); - auto tree = span>{}; + //auto tree = span>{}; auto levels = std::vector> >{}; auto leafIndex = u64{}; auto leafLevelPtr = (VecF*)nullptr; diff --git a/libOTe/TwoChooseOne/Iknp/IknpOtExtReceiver.cpp b/libOTe/TwoChooseOne/Iknp/IknpOtExtReceiver.cpp index e72a5e3..92a164d 100644 --- a/libOTe/TwoChooseOne/Iknp/IknpOtExtReceiver.cpp +++ b/libOTe/TwoChooseOne/Iknp/IknpOtExtReceiver.cpp @@ -219,11 +219,13 @@ namespace osuCrypto } } #else + std::cout << LOCATION << std::endl; mAesFixedKey.hashBlocks(messages.data(), messages.size(), messages.data()); #endif } static_assert(gOtExtBaseOtCount == 128, "expecting 128"); + std::cout << LOCATION << std::endl; } } diff --git a/libOTe/TwoChooseOne/Iknp/IknpOtExtSender.cpp b/libOTe/TwoChooseOne/Iknp/IknpOtExtSender.cpp index 2270788..68070c1 100644 --- a/libOTe/TwoChooseOne/Iknp/IknpOtExtSender.cpp +++ b/libOTe/TwoChooseOne/Iknp/IknpOtExtSender.cpp @@ -226,10 +226,14 @@ namespace osuCrypto } } #else + std::cout << LOCATION << std::endl; mAesFixedKey.hashBlocks((block*)messages.data(), messages.size() * 2, (block*)messages.data()); } #endif + + std::cout << LOCATION << std::endl; + static_assert(gOtExtBaseOtCount == 128, "expecting 128"); } diff --git a/libOTe/Vole/Noisy/NoisyVoleReceiver.h b/libOTe/Vole/Noisy/NoisyVoleReceiver.h index 40d7a33..44e1128 100644 --- a/libOTe/Vole/Noisy/NoisyVoleReceiver.h +++ b/libOTe/Vole/Noisy/NoisyVoleReceiver.h @@ -72,7 +72,7 @@ namespace osuCrypto { auto buff = std::vector{}; auto msg = VecF{}; auto temp = VecF{}; - auto prng = std::move(PRNG{}); + auto prng = PRNG{}; if (c.size() != a.size()) throw RTE_LOC; diff --git a/libOTe/Vole/Silent/SilentVoleReceiver.h b/libOTe/Vole/Silent/SilentVoleReceiver.h index 761ba37..1fd27ab 100644 --- a/libOTe/Vole/Silent/SilentVoleReceiver.h +++ b/libOTe/Vole/Silent/SilentVoleReceiver.h @@ -156,7 +156,7 @@ namespace osuCrypto auto baseVole = std::vector{}; auto baseOt = BaseOT{}; auto chl2 = Socket{}; - auto prng2 = std::move(PRNG{}); + auto prng2 = PRNG{}; auto noiseVals = VecG{}; auto baseAs = VecF{}; auto nv = NoisyVoleReceiver{}; diff --git a/libOTe/Vole/Silent/SilentVoleSender.h b/libOTe/Vole/Silent/SilentVoleSender.h index 37292aa..0cfdb7c 100644 --- a/libOTe/Vole/Silent/SilentVoleSender.h +++ b/libOTe/Vole/Silent/SilentVoleSender.h @@ -140,7 +140,7 @@ namespace osuCrypto auto msg = AlignedUnVector>(silentBaseOtCount()); auto baseOt = BaseOT{}; - auto prng2 = std::move(PRNG{}); + auto prng2 = PRNG{}; auto xx = BitVector{}; auto chl2 = Socket{}; auto nv = NoisyVoleSender{}; diff --git a/libOTe_Tests/ExConvCode_Tests.cpp b/libOTe_Tests/ExConvCode_Tests.cpp index 224c87f..1b1b485 100644 --- a/libOTe_Tests/ExConvCode_Tests.cpp +++ b/libOTe_Tests/ExConvCode_Tests.cpp @@ -456,11 +456,11 @@ namespace osuCrypto for (u64 i = 0; i < k; ++i) { - u64 w = 0; - for (u64 j = 0; j < k; ++j) - { - w += g(i, j); - } + //u64 w = 0; + //for (u64 j = 0; j < k; ++j) + //{ + // w += g(i, j); + //} //if (w < k / 2.2) { //std::cout << i << " " << w << std::endl;