mac compile fixes

Author: ladnir

libOTe/Dpf/RegularDpf.h

@@ -176,8 +176,8 @@ namespace osuCrypto
 		static block tagBit(const block& b)
 		{
 			auto bit = b & block(0, 1);
-			auto mask = _mm_sub_epi64(_mm_set1_epi64x(0), bit);
-			return _mm_unpacklo_epi64(mask, mask);
+			auto mask = block(0,0).sub_epi64(bit);
+			return mask.unpacklo_epi64(mask);
 		}
 	};
 

libOTe_Tests/OT_Tests.cpp

@@ -254,7 +254,7 @@ namespace tests_libOTe
 		for (u64 i = 0; i < 10000; ++i)
 		{
 			transpose128(data.data());
-			data[0] += block::allSame((u64)1);
+            data[0] = data[0].add_epi64(block::allSame((u64)1));
 		}
 
 		// Add a check just to make sure this doesn't get compiled out.

libOTe_Tests/Pprf_Tests.cpp

@@ -382,7 +382,7 @@ void Tools_Pprf_inter_test(const CLP& cmd)
     for (auto d : { 32,3242 }) for (auto n : { 8, 128 }) for (auto p : { true, false }) for (auto e : { true, false })
     {
         Tools_Pprf_test_impl<u64, u64, CoeffCtxInteger>(d, n, p, f, e, v);
-        Tools_Pprf_test_impl<block, block, CoeffCtxInteger>(d, n, p, f, e, v);
+        Tools_Pprf_test_impl<block, block, CoeffCtxGF2>(d, n, p, f, e, v);
     }
 }
 
@@ -397,7 +397,7 @@ void Tools_Pprf_ByLeafIndex_test(const CLP& cmd)
     for (auto d : { 32,3242 }) for (auto n : { 8, 128 }) for (auto p : { true/*, false */}) for (auto e : { true/*, false */})
     {
         Tools_Pprf_test_impl<u64, u64, CoeffCtxInteger>(d, n, p, f, e, v);
-        Tools_Pprf_test_impl<block, block, CoeffCtxInteger>(d, n, p, f, e, v);
+        Tools_Pprf_test_impl<block, block, CoeffCtxGF2>(d, n, p, f, e, v);
     }
 #else
     throw UnitTestSkipped("ENABLE_SILENTOT not defined.");
@@ -416,7 +416,7 @@ void Tools_Pprf_ByTreeIndex_test(const oc::CLP& cmd)
     for (auto d : { 32,3242 }) for (auto n : { 8, 19}) for (auto p : { true/*, false*/ })
     {
         Tools_Pprf_test_impl<u64, u64, CoeffCtxInteger>(d, n, p, f, false, v);
-        Tools_Pprf_test_impl<block, block, CoeffCtxInteger>(d, n, p, f, false, v);
+        Tools_Pprf_test_impl<block, block, CoeffCtxGF2>(d, n, p, f, false, v);
     }
 
 #else
@@ -435,7 +435,7 @@ void Tools_Pprf_callback_test(const oc::CLP& cmd)
     for (auto d : { 32,3242 }) for (auto n : { 8, 128 }) for (auto p : { true/*, false */})
     {
         Tools_Pprf_test_impl<u64, u64, CoeffCtxInteger>(d, n, p, f, false, v);
-        Tools_Pprf_test_impl<block, block, CoeffCtxInteger>(d, n, p, f, false, v);
+        Tools_Pprf_test_impl<block, block, CoeffCtxGF2>(d, n, p, f, false, v);
     }
 #else
     throw UnitTestSkipped("ENABLE_SILENTOT not defined.");