wanring fix

osu-crypto · Jun 12, 2024 · 32ad128 · 32ad128
1 parent 3298b42
commit 32ad128
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -41,12 +41,7 @@ jobs:
 
       - name: unit tests
         run: |
-             pwd
-             ls .out
-             ls .out/build
-             ls .out/build/linux
-             ls .out/build/linux/frontend
-              ./out/build/linux/frontend/frontend_libOTe -u
+             ./out/build/linux/frontend/frontend_libOTe -u
        
 
       - name: find source tree

diff --git a/cryptoTools b/cryptoTools
diff --git a/libOTe/Base/MasnyRindalKyber.cpp b/libOTe/Base/MasnyRindalKyber.cpp
@@ -12,7 +12,8 @@ namespace osuCrypto
 		span<block> messages,
 		PRNG& prng,
 		Socket& chl)
-	try {
+	{
+		MACORO_TRY{
 		static_assert(std::is_trivial<KyberOtRecvPKs>::value, "");
 		static_assert(std::is_trivial<KyberOTCtxt>::value, "");
 
@@ -40,18 +41,18 @@ namespace osuCrypto
 			KyberReceiverStrings(&ot[i], &ctxts[i]);
 			memcpy(&messages[i], ot[i].rot, sizeof(block));
 		}
-	}
-	catch (...)
-	{
-		chl.close();
-		throw;
+		} MACORO_CATCH(eptr) {
+			co_await chl.close();
+			std::rethrow_exception(eptr);
+		}
 	}
 
 	task<> MasnyRindalKyber::send(
 		span<std::array<block, 2>> messages,
 		PRNG& prng,
 		Socket& chl)
-	try {
+	{
+		MACORO_TRY{
 		auto pkBuff = std::vector<KyberOtRecvPKs>{};
 		auto ctxts = std::vector<KyberOTCtxt>{};
 		auto ptxt = KyberOTPtxt{ };
@@ -76,11 +77,11 @@ namespace osuCrypto
 		}
 
 		co_await chl.send(std::move(ctxts));
-	}
-	catch (...)
-	{
-		chl.close();
-		throw;
+
+		} MACORO_CATCH(eptr) {
+			co_await chl.close();
+			std::rethrow_exception(eptr);
+		}
 	}
 }
 #endif