From b86845408c3c6c0d67a9a404f1a3ea2028614f1d Mon Sep 17 00:00:00 2001 From: Leandro Doctors Date: Sat, 22 Feb 2025 04:38:55 +0100 Subject: [PATCH 1/4] add comment to cmake file --- extern/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 1aa6bd3..7d2c1bc 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -13,6 +13,7 @@ execute_process(COMMAND "${PROJECT_SOURCE_DIR}/cmake/patch-valijson.sh" "${PROJECT_SOURCE_DIR}/extern/valijson") +# First add all subdirectories add_subdirectory(ABY) add_subdirectory(fmt) add_subdirectory(cxxopts) @@ -22,6 +23,7 @@ add_subdirectory(restbed EXCLUDE_FROM_ALL) add_subdirectory(curlpp EXCLUDE_FROM_ALL) add_subdirectory(spdlog EXCLUDE_FROM_ALL) +# Then set compile options target_compile_options(aby PRIVATE "-w") target_compile_options(encrypto_utils PRIVATE "-w") target_compile_options(otextension PRIVATE "-w") From e20d636aceeff6783f63cd5a12d61c52220ae2dc Mon Sep 17 00:00:00 2001 From: Leandro Doctors Date: Thu, 20 Feb 2025 15:37:06 +0100 Subject: [PATCH 2/4] Update instructions based on my experiment on Debian "testing" --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65cdaff..7d2a2ff 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ What you need to build and install. git cmake (>= 3.10) c++ 17 compatible compiler (gcc >= 8, Ubuntu: g++-8) -boost development headers (for restbed) (Ubuntu: libboost-dev) +boost development headers (for restbed) (Ubuntu: libboost-dev, +probably also libboost-system-dev and libboost-thread-dev; if not, libboost-all-dev) libcurl (Ubuntu: libcurl4-openssl-dev) openssl (Ubuntu: libssl-dev) gmp (Ubuntu: libgmp-dev) @@ -44,7 +45,7 @@ more submodules than necessary. ### Build -#### OpenSSL (only on Arch) +#### OpenSSL (only on Arch, or later Debian/Ubuntu versions) As mentioned above, on Arch you may need to manually compile (static) openssl libs: From 564a6146f6578e579760d139860988e0fc19d998 Mon Sep 17 00:00:00 2001 From: Leandro Doctors Date: Sat, 22 Feb 2025 03:12:20 +0100 Subject: [PATCH 3/4] Add additional steps (WIP) --- README.md | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7d2a2ff..ced9978 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ more submodules than necessary. ### Build -#### OpenSSL (only on Arch, or later Debian/Ubuntu versions) +#### Static OpenSSL (only on Arch, or later Debian/Ubuntu versions) As mentioned above, on Arch you may need to manually compile (static) openssl libs: @@ -69,6 +69,44 @@ make -j$(nproc) sel Omit or customize `-j` if you don't want to build in parallel with the maximum amount of threads available on your system. +### Alternative Build intructionis (WIP) + +#### Other steps (WIP) + +##### MIRACL + +``` +cd extern/ABY/extern/ENCRYPTO_utils/extern/MIRACL +cmake . +make +``` + +##### Force-Updating all submodules +``` +git submodule update --init --force +``` + +``` +% more scripts/init_submodules.sh +#!/bin/sh + +echo Switching to repo toplevel directory +set -x -e +cd $(git rev-parse --show-toplevel) + +git submodule update --init + +cd extern/restbed +git submodule update --init + +cd ../ABY +git submodule update --init # ENCRYPTO_utils and OTExtension +cd extern/ENCRYPTO_utils +git submodule update --init # MIRACL + +``` + + ### Running The default server configuration logs to `../log/`, so create that directory in the @@ -196,7 +234,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc ## Versioning -We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://git.compbiol.bio.tu-darmstadt.de/kussel/secure_epilink/tags). +We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://git.compbiol.bio.tu-darmstadt.de/kussel/secure_epilink/tags). ## Authors @@ -212,4 +250,3 @@ This project is licensed under the AGPL License - see the [LICENSE](LICENSE) fil * Thanks to [Lennart Braun](https://github.com/lenerd/ABY-build) for a sane ABY build process * This work has been supported by the German Federal Ministry of Education and Research (BMBF) and by the Hessian State Ministry for Higher Education, Research and the Arts (HMWK) within the [HiGHmed Consortium](http://www.highmed.org) and [CRISP](http://www.crisp-da.de). - From 4ac381cdcb3118559e0377ca82fa0a8c002090d2 Mon Sep 17 00:00:00 2001 From: Leandro Doctors Date: Sat, 22 Feb 2025 03:19:32 +0100 Subject: [PATCH 4/4] Fix init script It also simplifies the process. --- scripts/init_submodules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init_submodules.sh b/scripts/init_submodules.sh index 474bbea..4cb3b75 100755 --- a/scripts/init_submodules.sh +++ b/scripts/init_submodules.sh @@ -7,7 +7,7 @@ cd $(git rev-parse --show-toplevel) git submodule update --init cd extern/restbed -git submodule update --init dependency/asio dependency/catch # ignore openssl +git submodule update --init cd ../ABY git submodule update --init # ENCRYPTO_utils and OTExtension