Rebased and merged branch 'public' of https://github.com/oliver-schic…

…k/ABY into public
encryptogroup · Feb 10, 2020 · 0a4d813 · 0a4d813
2 parents a2fc640 + afd317e
commit 0a4d813
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,9 @@ docs/*
 # build directory
 build*/
 
+#dependencies directory
+extern/dependencies/
+
 # CMake
 CMakeCache.txt
 CMakeFiles

diff --git a/src/abycore/cmake/Modules/FetchENCRYPTO_utils.cmake b/src/abycore/cmake/Modules/FetchENCRYPTO_utils.cmake
@@ -7,11 +7,11 @@ set(ENCRYPTO_utils_REPOSITORY
 set(ENCRYPTO_utils_TAG master CACHE STRING "Git tag of downloaded ENCRYPTO_utils project.")
 #Specific commit hash. Please regularly update to maintain compatibility with ABY.
 set(ENCRYPTO_utils_URL 
-    https://github.com/oliver-schick/ENCRYPTO_utils/archive/0380d7f82bc871ab9b1c593265e92482a070d8cf.zip
+    https://github.com/oliver-schick/ENCRYPTO_utils/archive/6eeeed58c7206ab9f404521f36130c14beb5efdb.zip
     CACHE STRING "URL of ENCRYPTO_utils project.")
 #sha256sum of downloaded file. To get it on linux simply type following command line:
 #$ wget -O out [URL] && sha256sum out
-set(ENCRYPTO_utils_URL_HASH SHA256=e50fe0667a313a3209492bac20516750b4fa6b8bb19fd94f84043ac1fbbdbd68 CACHE STRING "Hash of ENCRYPTO_utils archive.")
+set(ENCRYPTO_utils_URL_HASH SHA256=c0629dd4ce5e73609f12d3a8c285b4e129416d0102bc475369b6eb895acbe876 CACHE STRING "Hash of ENCRYPTO_utils archive.")
 option(DOWNLOAD_ENCRYPTO_utils "Set this option to download a specific commit of ENCRYPTO_utils." OFF)
 mark_as_advanced(ENCRYPTO_utils_REPOSITORY ENCRYPTO_utils_TAG ENCRYPTO_utils_URL ENCRYPTO_utils_URL_HASH DOWNLOAD_ENCRYPTO_utils)
 

diff --git a/src/abycore/cmake/Modules/FetchOTExtension.cmake b/src/abycore/cmake/Modules/FetchOTExtension.cmake
@@ -7,11 +7,11 @@ set(OTExtension_REPOSITORY
 set(OTExtension_TAG master CACHE STRING "Git tag of downloaded OTExtension project.")
 #Specific commit hash. Please regularly update to maintain compatibility with ABY.
 set(OTExtension_URL 
-    https://github.com/oliver-schick/OTExtension/archive/5948eb026ac94f88c55b2d198ccc89234a79858f.zip 
+    https://github.com/oliver-schick/OTExtension/archive/c41ade2b0aa92204f55c07361360f056395f075d.zip 
     CACHE STRING "URL of OTExtension project.")
 #sha256sum of downloaded file. To get it on linux simply type following command line:
 #$ wget -O out [URL] && sha256sum out
-set(OTExtension_URL_HASH SHA256=c64bc174706ddd7def18dcd8974b55ee8036d371a7d85fea0a48bfe290ca0b23 CACHE STRING "Hash of OTExtension archive.")
+set(OTExtension_URL_HASH SHA256=212e2e0875d97204b21aa962652a1aa7ddb631d0cc249aa1a05d8bdc220ac6ad CACHE STRING "Hash of OTExtension archive.")
 option(DOWNLOAD_OTExtension "Set this option to download a specific commit of OTExtension." OFF)
 mark_as_advanced(OTExtension_REPOSITORY OTExtension_TAG OTExtension_URL OTExtension_URL_HASH DOWNLOAD_OTExtension)