warning and blake update

osu-crypto · Apr 29, 2024 · 7d9c84b · 7d9c84b
1 parent 894ddce
commit 7d9c84b
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 12 deletions.
diff --git a/cryptoTools b/cryptoTools
diff --git 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
@@ -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
@@ -118,7 +118,7 @@ namespace osuCrypto
 
             pprf::validateExpandFormat(oFormat, output, mDomain, mPntCount);
 
-            auto tree = span<AlignedArray<block, 8>>{};
+            //auto tree = span<AlignedArray<block, 8>>{};
             auto levels = std::vector<span<AlignedArray<block, 8>> >{};
             auto leafIndex = u64{};
             auto leafLevelPtr = (VecF*)nullptr;

diff --git 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
@@ -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
@@ -72,7 +72,7 @@ namespace osuCrypto {
 			auto buff = std::vector<u8>{};
 			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
@@ -156,7 +156,7 @@ namespace osuCrypto
 			auto baseVole = std::vector<block>{};
 			auto baseOt = BaseOT{};
 			auto chl2 = Socket{};
-			auto prng2 = std::move(PRNG{});
+			auto prng2 = PRNG{};
 			auto noiseVals = VecG{};
 			auto baseAs = VecF{};
 			auto nv = NoisyVoleReceiver<F, G, Ctx>{};

diff --git a/libOTe/Vole/Silent/SilentVoleSender.h b/libOTe/Vole/Silent/SilentVoleSender.h
@@ -140,7 +140,7 @@ namespace osuCrypto
 
 			auto msg = AlignedUnVector<std::array<block, 2>>(silentBaseOtCount());
 			auto baseOt = BaseOT{};
-			auto prng2 = std::move(PRNG{});
+			auto prng2 = PRNG{};
 			auto xx = BitVector{};
 			auto chl2 = Socket{};
 			auto nv = NoisyVoleSender<F, G, Ctx>{};

diff --git 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;
+1 −1		cryptoTools/Crypto/Blake2.h
+108 −103		cryptoTools/Crypto/blake2/c/blake2-impl.h
+168 −171		cryptoTools/Crypto/blake2/c/blake2.h
+0 −383		cryptoTools/Crypto/blake2/c/blake2b-ref.c
+386 −0		cryptoTools/Crypto/blake2/c/blake2b-ref.cpp
+0 −362		cryptoTools/Crypto/blake2/c/blake2bp-ref.c
+365 −0		cryptoTools/Crypto/blake2/c/blake2bp-ref.cpp
+0 −370		cryptoTools/Crypto/blake2/c/blake2s-ref.c
+373 −0		cryptoTools/Crypto/blake2/c/blake2s-ref.cpp
+0 −363		cryptoTools/Crypto/blake2/c/blake2sp-ref.c
+365 −0		cryptoTools/Crypto/blake2/c/blake2sp-ref.cpp
+0 −244		cryptoTools/Crypto/blake2/c/blake2xb-ref.c
+247 −0		cryptoTools/Crypto/blake2/c/blake2xb-ref.cpp
+0 −242		cryptoTools/Crypto/blake2/c/blake2xs-ref.c
+245 −0		cryptoTools/Crypto/blake2/c/blake2xs-ref.cpp
+2 −14		cryptoTools/Crypto/blake2/sse/blake2-config.h
+119 −113		cryptoTools/Crypto/blake2/sse/blake2-impl.h
+144 −149		cryptoTools/Crypto/blake2/sse/blake2.h
+1 −1		cryptoTools/Crypto/blake2/sse/blake2b-load-sse2.h
+1 −1		cryptoTools/Crypto/blake2/sse/blake2b-load-sse41.h
+1 −1		cryptoTools/Crypto/blake2/sse/blake2b-round.h
+0 −376		cryptoTools/Crypto/blake2/sse/blake2b.c
+380 −0		cryptoTools/Crypto/blake2/sse/blake2b.cpp
+109 −103		cryptoTools/Crypto/blake2/sse/blake2bp.cpp
+0 −244		cryptoTools/Crypto/blake2/sse/blake2xb.c
+248 −0		cryptoTools/Crypto/blake2/sse/blake2xb.cpp