try catch for protocols

osu-crypto · May 1, 2024 · 2f10f3b · 2f10f3b
1 parent cdab2ba
commit 2f10f3b
Show file tree

Hide file tree

Showing 23 changed files with 1,503 additions and 1,193 deletions.
diff --git a/libOTe/Base/MasnyRindal.cpp b/libOTe/Base/MasnyRindal.cpp
@@ -26,7 +26,7 @@ namespace osuCrypto
         span<block> messages,
         PRNG& prng,
         Socket& chl)
-    {
+    try {
         using namespace DefaultCurve;
 
         //MC_BEGIN(task<>, &choices, messages, &prng, &chl,            
@@ -91,10 +91,15 @@ namespace osuCrypto
         }
 
     }
+    catch (...)
+    {
+        chl.close();
+        throw;
+    }
 
 
     task<> MasnyRindal::send(span<std::array<block, 2>> messages, PRNG& prng, Socket& chl)
-    {
+    try {
         using namespace DefaultCurve;
         Curve{}; // required to init relic
 
@@ -143,5 +148,10 @@ namespace osuCrypto
             }
         }
     }
+    catch (...)
+    {
+        chl.close();
+        throw;
+    }
 }
 #endif
diff --git a/libOTe/Base/MasnyRindalKyber.cpp b/libOTe/Base/MasnyRindalKyber.cpp
@@ -12,7 +12,7 @@ namespace osuCrypto
 		span<block> messages,
 		PRNG& prng,
 		Socket& chl)
-	{
+	try {
 		static_assert(std::is_trivial<KyberOtRecvPKs>::value, "");
 		static_assert(std::is_trivial<KyberOTCtxt>::value, "");
 
@@ -41,12 +41,17 @@ namespace osuCrypto
 			memcpy(&messages[i], ot[i].rot, sizeof(block));
 		}
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 	task<> MasnyRindalKyber::send(
 		span<std::array<block, 2>> messages,
 		PRNG& prng,
 		Socket& chl)
-	{
+	try {
 		auto pkBuff = std::vector<KyberOtRecvPKs>{};
 		auto ctxts = std::vector<KyberOTCtxt>{};
 		auto ptxt = KyberOTPtxt{ };
@@ -72,5 +77,10 @@ namespace osuCrypto
 
 		co_await chl.send(std::move(ctxts));
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 }
 #endif
diff --git a/libOTe/Base/McRosRoy.h b/libOTe/Base/McRosRoy.h
@@ -116,7 +116,7 @@ namespace osuCrypto
             span<block> messages,
             PRNG& prng,
             Socket& chl)
-        {
+        try {
 
             auto A = Point{};
             auto sk = std::vector<Number>{};
@@ -159,13 +159,18 @@ namespace osuCrypto
             }
 
         }
+        catch (...)
+        {
+            chl.close();
+            throw;
+        }
 
         template<typename DSPopf>
         task<> McRosRoy<DSPopf>::send(
             span<std::array<block, 2>> msg,
             PRNG& prng,
             Socket& chl)
-        {
+        try {
 
             Curve{}; // init relic
             auto A = Point{};
@@ -211,6 +216,11 @@ namespace osuCrypto
                 ro.Final(msg[i][1]);
             }
         }
+        catch (...)
+        {
+            chl.close();
+            throw;
+        }
     }
 }
 

diff --git a/libOTe/Base/McRosRoyTwist.h b/libOTe/Base/McRosRoyTwist.h
@@ -138,7 +138,7 @@ namespace osuCrypto
 
 		template<typename DSPopf>
 		inline task<> McRosRoyTwist<DSPopf>::receive(const BitVector& choices, span<block> messages, PRNG& prng, Socket& chl)
-		{
+		try {
 			auto n = choices.size();
 			auto sk = std::vector<Scalar25519>{};
 			auto curveChoice = std::vector<u8>{};
@@ -179,10 +179,15 @@ namespace osuCrypto
 				ro.Final(messages[i]);
 			}
 		}
+		catch (...)
+		{
+			chl.close();
+			throw;
+		}
 
 		template<typename DSPopf>
 		inline task<> McRosRoyTwist<DSPopf>::send(span<std::array<block, 2>> msg, PRNG& prng, Socket& chl)
-		{
+		try {
 
 			auto n = static_cast<u64>(msg.size());
 			auto sk = Scalar25519(prng);
@@ -225,6 +230,11 @@ namespace osuCrypto
 				ro.Final(msg[i][1]);
 			}
 		}
+		catch (...)
+		{
+			chl.close();
+			throw;
+		}
 
 		template<typename DSPopf>
 		inline typename McRosRoyTwist<DSPopf>::Monty25519 McRosRoyTwist<DSPopf>::blockToCurve(Block256 b)

diff --git a/libOTe/Base/SimplestOT.cpp b/libOTe/Base/SimplestOT.cpp
@@ -15,7 +15,7 @@ namespace osuCrypto
 		span<block> msg,
 		PRNG& prng,
 		Socket& chl)
-	{
+	try {
 		using namespace DefaultCurve;
 		Curve{};// init relic
 		auto buff = std::vector<u8>{};
@@ -75,12 +75,17 @@ namespace osuCrypto
 			ro.Final(msg[i]);
 		}
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 	task<> SimplestOT::send(
 		span<std::array<block, 2>> msg,
 		PRNG& prng,
 		Socket& chl)
-	{
+	try {
 		using namespace DefaultCurve;
 		Curve{}; // init relic
 
@@ -142,6 +147,11 @@ namespace osuCrypto
 			ro.Final(msg[i][1]);
 		}
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 }
 #endif
 
@@ -397,7 +407,7 @@ namespace osuCrypto
 		span<block> msg,
 		PRNG& prng,
 		Socket& chl)
-	{
+	try {
 		auto rs = AlginedState<RecvState>();
 		auto rd = rs->recvData();
 		co_await chl.recv(rd);
@@ -410,12 +420,17 @@ namespace osuCrypto
 			rs->gen4(i, msg);
 		}
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 	task<> AsmSimplestOT::send(
 		span<std::array<block, 2>> msg,
 		PRNG& prng,
 		Socket& chl)
-	{
+	try {
 		auto ss = AlginedState<SendState>();
 
 		auto sd = ss->init(prng);
@@ -428,5 +443,10 @@ namespace osuCrypto
 			ss->gen4(i, msg);
 		}
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 }
 #endif
diff --git a/libOTe/NChooseOne/Kkrt/KkrtNcoOtReceiver.cpp b/libOTe/NChooseOne/Kkrt/KkrtNcoOtReceiver.cpp
@@ -33,7 +33,7 @@ namespace osuCrypto
 
 
 	task<> KkrtNcoOtReceiver::init(u64 numOtExt, PRNG& prng, Socket& chl)
-	{
+	try {
 		if (hasBaseOts() == false)
 			co_await(genBaseOts(prng, chl));
 
@@ -140,6 +140,11 @@ namespace osuCrypto
 		PRNG(theirSeed).get(keys.data(), keys.size());
 		mMultiKeyAES.setKeys(keys);
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 
 	u64 KkrtNcoOtReceiver::getBaseOTCount() const
@@ -311,7 +316,7 @@ namespace osuCrypto
 	}
 
 	task<> KkrtNcoOtReceiver::sendCorrection(Socket& chl, u64 sendCount)
-	{
+	try {
 
 #ifndef NDEBUG
 		// make sure these OTs all contain valid correction values, aka encode has been called.
@@ -334,6 +339,11 @@ namespace osuCrypto
 
 		co_await chl.send(std::move(sub));
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 }
 #endif
diff --git a/libOTe/NChooseOne/Kkrt/KkrtNcoOtSender.cpp b/libOTe/NChooseOne/Kkrt/KkrtNcoOtSender.cpp
@@ -67,7 +67,7 @@ namespace osuCrypto
 
 	task<> KkrtNcoOtSender::init(
 		u64 numOTExt, PRNG& prng, Socket& chl)
-	{
+	try {
 
 
 
@@ -162,6 +162,11 @@ namespace osuCrypto
 			doneIdx = stopIdx;
 		}
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 	void KkrtNcoOtSender::encode(u64 otIdx, const void* input, void* dest, u64 destSize)
 	{
@@ -258,7 +263,7 @@ namespace osuCrypto
 	}
 
 	task<> KkrtNcoOtSender::recvCorrection(Socket& chl, u64 recvCount)
-	{
+	try {
 
 #ifndef NDEBUG
 		if (recvCount > mCorrectionVals.bounds()[0] - mCorrectionIdx)
@@ -272,5 +277,10 @@ namespace osuCrypto
 		mCorrectionIdx += recvCount;
 		co_await chl.recv(span<block>(&*dest, recvCount * mCorrectionVals.stride()));
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 }
 #endif
diff --git a/libOTe/NChooseOne/NcoOtExt.cpp b/libOTe/NChooseOne/NcoOtExt.cpp
@@ -15,7 +15,7 @@ namespace osuCrypto
 {
 
 	task<> NcoOtExtReceiver::genBaseOts(PRNG& prng, Socket& chl)
-	{
+	try {
 		struct TT
 		{
 #ifdef ENABLE_IKNP
@@ -59,10 +59,15 @@ namespace osuCrypto
 		co_await(setBaseOts(msgs, prng, chl));
 
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 
 	task<> NcoOtExtSender::genBaseOts(PRNG& prng, Socket& chl)
-	{
+	try {
 		struct TT
 		{
 #ifdef ENABLE_IKNP
@@ -108,9 +113,14 @@ namespace osuCrypto
 		co_await(setBaseOts(msgs, bv, chl));
 
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 	task<> NcoOtExtSender::sendChosen(MatrixView<block> messages, PRNG& prng, Socket& chl)
-	{
+	try {
 		auto temp = Matrix<block>{};
 
 		if (hasBaseOts() == false)
@@ -143,12 +153,17 @@ namespace osuCrypto
 		co_await(chl.send(std::move(temp)));
 
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 
 	task<> NcoOtExtReceiver::receiveChosen(
 		u64 numMsgsPerOT,
 		span<block> messages,
 		span<u64> choices, PRNG& prng, Socket& chl)
-	{
+	try {
 		auto temp = Matrix<block>{};
 
 		if (hasBaseOts() == false)
@@ -181,5 +196,10 @@ namespace osuCrypto
 		}
 
 	}
+	catch (...)
+	{
+		chl.close();
+		throw;
+	}
 }
 #endif