Skip to content

Commit 0937f04

Browse files
committed
The upstream FIPS bug is fixed
Try to build with `--enable-fips` option again
1 parent a18ae5a commit 0937f04

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

bin/source-erlang.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,12 @@ else
8080
DISABLE_JIT=""
8181
fi
8282

83-
if [[ ${ERLANGMAJORVERSION} -gt 25 ]]; then
84-
echo "************************* WARNING ***************************"
85-
echo "As of 2024-07-11 Erlang 26.2.5* fails access any crypto functions"
86-
echo "on OSes with OpenSSL 3.0.x (Debian Bookworm, at least) if the "
87-
echo "--enable-fips flag is enabled. See: github.com/erlang/otp/issues/8562"
88-
echo "**************************************************************"
89-
ENABLE_FIPS=""
90-
else
91-
ENABLE_FIPS="--enable-fips"
92-
fi
93-
9483
# Configure Erlang - skip building things we don't want or need
9584
./configure \
9685
--without-javac --without-wx --without-odbc \
9786
--without-debugger --without-observer --without-et \
9887
--without-diameter --without-megaco --without-tftp \
99-
--without-ftp \
88+
--without-ftp --enable-fips \
10089
${ENABLE_FIPS} ${DISABLE_JIT}
10190

10291
make -j $(nproc)

pull-all-couchdbdev-docker

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ DOCKER_ORG="apache"
55
# These are the images that are currently being used, so don't `docker rmi` them on cleanup.
66
KEEP_IMAGES=(
77
couchdbci-debian:bookworm-erlang-25.3.2.13
8-
couchdbci-debian:bookworm-erlang-26.2.5.2
8+
couchdbci-debian:bookworm-erlang-26.2.5.4
9+
couchdbci-debian:bookworm-erlang:27.1.1
910
couchdbci-centos:9-erlang-25.3.2.13
1011
couchdbci-centos:8-erlang-25.3.2.13
1112
couchdbci-ubuntu:jammy-erlang-25.3.2.13

0 commit comments

Comments
 (0)