diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2024-01-18 18:20:00 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2024-01-18 18:20:00 -0500 |
| commit | dc3441f2586fdc91287f1f788a6885d1247850e6 (patch) | |
| tree | c55f9f835bda6c5673d0ce4d14db9ce108d79beb | |
| parent | 7791cb08a9616f456a56aba383952b753dd5f75c (diff) | |
| parent | 84ea1776aef39ca2757bc93095f2ad066be0bb91 (diff) | |
| download | monzero-gui-dc3441f2586fdc91287f1f788a6885d1247850e6.tar.gz monzero-gui-dc3441f2586fdc91287f1f788a6885d1247850e6.tar.xz monzero-gui-dc3441f2586fdc91287f1f788a6885d1247850e6.zip | |
Merge pull request #4262
84ea177 Dockerfile: remove no-asm for constant time AES (selsta)
| -rw-r--r-- | Dockerfile.android | 2 | ||||
| -rw-r--r-- | Dockerfile.linux | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile.android b/Dockerfile.android index 88f38c5b..8bd064b3 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -125,7 +125,7 @@ RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ && rm openssl-${OPENSSL_VERSION}.tar.gz \ && cd openssl-${OPENSSL_VERSION} \ && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} ./Configure CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} \ - android-arm64 no-asm no-shared --static \ + android-arm64 no-shared --static \ --with-zlib-include=${PREFIX}/include --with-zlib-lib=${PREFIX}/lib \ --prefix=${PREFIX} --openssldir=${PREFIX} \ && sed -i 's/CNF_EX_LIBS=-ldl -pthread//g;s/BIN_CFLAGS=-pie $(CNF_CFLAGS) $(CFLAGS)//g' Makefile \ diff --git a/Dockerfile.linux b/Dockerfile.linux index b0e60af5..bc1fc81f 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -170,7 +170,7 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1u.tar.gz && \ tar -xzf openssl-1.1.1u.tar.gz && \ rm openssl-1.1.1u.tar.gz && \ cd openssl-1.1.1u && \ - ./config no-asm no-shared no-zlib-dynamic --prefix=/usr --openssldir=/usr && \ + ./config no-shared no-zlib-dynamic --prefix=/usr --openssldir=/usr && \ make -j$THREADS && \ make -j$THREADS install && \ rm -rf $(pwd) |