Merge pull request #4262

84ea177 Dockerfile: remove no-asm for constant time AES (selsta)
monero-project · Jan 18, 2024 · dc3441f · dc3441f
2 parents 7791cb0 + 84ea177
commit dc3441f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)