minor circuit, prng, coproto update

ladnir · Aug 5, 2023 · 3f0ced6 · 3f0ced6
1 parent cb188c9
commit 3f0ced6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/cryptoTools/Circuit/BetaLibrary.cpp b/cryptoTools/Circuit/BetaLibrary.cpp
@@ -1578,18 +1578,41 @@ namespace osuCrypto
 		BetaBundle& out)
 	{
 		auto bits = a1.mWires.size();
-		BetaBundle temp(1);
-		cd.addTempWireBundle(temp);
-		cd.addGate(a1.mWires[0], a2.mWires[0],
-			GateType::Nxor, out.mWires[0]);
+		BetaBundle temp(bits);
+
+		if (bits == 1)
+			temp[0] = out[0];
+		else
+			cd.addTempWireBundle(temp);
 
-		for (u64 i = 1; i < bits; ++i)
+		for (u64 i = 0; i < bits; ++i)
 		{
 			cd.addGate(a1.mWires[i], a2.mWires[i],
 				GateType::Nxor, temp.mWires[0]);
+		}
+
+		auto levels = log2ceil(bits);
+		for (u64 i = 0; i < levels; ++i)
+		{
+			auto step = 1ull << i;
+			auto size = bits / 2 / step;
+			BetaBundle temp2(size);
+			if (size == 1)
+				temp2[0] = out[0];
+			else
+				cd.addTempWireBundle(temp2);
+
+			for (u64 j = 0; j < size; ++j)
+			{
+				cd.addGate(
+					temp[2 * j + 0],
+					temp[2 * j + 1],
+					oc::GateType::And,
+					temp2[j]
+				);
+			}
 
-			cd.addGate(temp.mWires[0], out.mWires[0],
-				GateType::And, out.mWires[0]);
+			temp = std::move(temp2);
 		}
 	}
 

diff --git a/cryptoTools/Crypto/PRNG.h b/cryptoTools/Crypto/PRNG.h
@@ -156,6 +156,12 @@ namespace osuCrypto
 
         // refills the internal buffer with fresh randomness
         void refillBuffer();
+
+
+        PRNG fork()
+        {
+            return PRNG(get<block>());
+        }
     };
 
     // specialization to make bool work correctly.

diff --git a/thirdparty/getCoproto.cmake b/thirdparty/getCoproto.cmake
@@ -2,7 +2,7 @@
 set(USER_NAME           )      
 set(TOKEN               )      
 set(GIT_REPOSITORY      "https://github.com/Visa-Research/coproto.git")
-set(GIT_TAG             "07fa4143f1ac3f2b95953b41c75c5065462371d3" )
+set(GIT_TAG             "859b4bda569ec2ac936c951952448e44052a911c" )
 
 set(CLONE_DIR "${OC_THIRDPARTY_CLONE_DIR}/coproto")
 set(BUILD_DIR "${CLONE_DIR}/out/build/${OC_CONFIG}")