updated version to 1.0.0

osu-crypto · Feb 7, 2020 · 3ccd11c · 3ccd11c
1 parent 0fd8e28
commit 3ccd11c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/frontend/OtBinMain.h b/frontend/OtBinMain.h
@@ -28,12 +28,6 @@ void rr17bRecv(
 void rr17bSend(
     LaunchParams& params);
 
-void rr17bRecv_StandardModel(
-    LaunchParams& params);
-
-void rr17bSend_StandardModel(
-    LaunchParams& params);
-
 
 void kkrtRecv(
     LaunchParams& params);

diff --git a/frontend/main.cpp b/frontend/main.cpp
@@ -527,7 +527,7 @@ int main(int argc, char** argv)
 
 
 		std::cout << "Unit Tests:\n"
-			<< "   -" << unitTestTags[0] << ": Run all unit tests\n" << std::endl;
+			<< "   -u: Run all unit tests\n" << std::endl;
 
 	}
 	return 0;

diff --git a/libPSI/Version.h b/libPSI/Version.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include <cryptoTools/Common/Version.h>
+#include <libOTe/config.h>
 
-
-static_assert(CRYPTO_TOOLS_VERSION >= 10303, "please update libOTe and cryptoTools.");
+static_assert(CRYPTO_TOOLS_VERSION >= 10500, "please update libOTe and cryptoTools.");
+static_assert(LIBOTE_VERSION >= 10000, "please update libOTe and cryptoTools.");
 
 #define LIB_PSI_VERSION_MAJOR 1
-#define LIB_PSI_VERSION_MINOR 0
+#define LIB_PSI_VERSION_MINOR 1
 #define LIB_PSI_VERSION_PATCH 0
 #define LIB_PSI_VERSION (LIB_PSI_VERSION_MAJOR * 10000 + LIB_PSI_VERSION_MINOR * 100 + LIB_PSI_VERSION_PATCH)
diff --git a/libPSI/config.h b/libPSI/config.h
@@ -2,6 +2,10 @@
 #include <cryptoTools/Common/config.h>
 #include <libOTe/config.h>
 
+#if LIBOTE_VERSION < 10000
+Config ERROR : libOTe is too old.
+#endif
+
 #define ON 1
 
 
@@ -13,15 +17,16 @@ Config ERROR: ENABLE_RELIC flag does not match with libOTe
 Config ERROR: ENABLE_MIRACL flag does not match with libOTe
 #endif
 
-#if ENABLE_SIMPLESTOT !=  ON
+#if !defined(_MSC_VER) &&  (ENABLE_SIMPLESTOT !=  ON)
 Config ERROR: ENABLE_SIMPLESTOT flag does not match with libOTe
 #endif
 
-#if ENABLE_MR_KYBER !=  ON
+#if !defined(_MSC_VER) && (ENABLE_MR_KYBER !=  ON)
 Config ERROR: ENABLE_MR_KYBER flag does not match with libOTe
 #endif
 
 
+
 // build the library with DCW PSI enabled
 #define ENABLE_DCW_PSI  ON
 

diff --git a/libPSI/config.h.in b/libPSI/config.h.in
@@ -2,8 +2,11 @@
 #include <cryptoTools/Common/config.h>
 #include <libOTe/config.h>
 
-#define ON 1
+#if LIBOTE_VERSION < 10000
+Config ERROR: libOTe is too old.
+#endif
 
+#define ON 1
 
 #if ENABLE_RELIC !=  @ENABLE_RELIC@
 Config ERROR: ENABLE_RELIC flag does not match with libOTe
@@ -13,15 +16,14 @@ Config ERROR: ENABLE_RELIC flag does not match with libOTe
 Config ERROR: ENABLE_MIRACL flag does not match with libOTe
 #endif
 
-#if ENABLE_SIMPLESTOT !=  @ENABLE_SIMPLESTOT@
+#if !defined(_MSC_VER) && (ENABLE_SIMPLESTOT !=  @ENABLE_SIMPLESTOT@)
 Config ERROR: ENABLE_SIMPLESTOT flag does not match with libOTe
 #endif
 
-#if ENABLE_MR_KYBER !=  @ENABLE_MR_KYBER@
+#if !defined(_MSC_VER) && (ENABLE_MR_KYBER !=  @ENABLE_MR_KYBER@)
 Config ERROR: ENABLE_MR_KYBER flag does not match with libOTe
 #endif
 
-
 // build the library with DCW PSI enabled
 #cmakedefine ENABLE_DCW_PSI  @ENABLE_DCW_PSI@