Skip to content

Commit 5978388

Browse files
committed
build: remove libressl check
Now that BIP66 passed, OpenSSL is no longer directly part of the consensus. What matters is that DER signatures are correctly parsed, and secp256k1 crypto is implemented correctly (as well as the other functions we use from OpenSSL, such as random number generation) This means that effectively, using LibreSSL is not a larger risk than using another version of OpenSSL. Remove the specific check for LibreSSL. Includes the still-relevant part of #6729: make sure CHECK_HEADER is called using the right CXXFLAGS, not CFLAGS (as AC_LANG is c++).
1 parent 4899a04 commit 5978388

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

configure.ac

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -700,27 +700,12 @@ else
700700
fi
701701
fi
702702

703-
CFLAGS_TEMP="$CFLAGS"
703+
CXXFLAGS_TEMP="$CXXFLAGS"
704704
LIBS_TEMP="$LIBS"
705-
CFLAGS="$CFLAGS $SSL_CFLAGS $CRYPTO_CFLAGS"
705+
CXXFLAGS="$CXXFLAGS $SSL_CFLAGS $CRYPTO_CFLAGS"
706706
LIBS="$LIBS $SSL_LIBS $CRYPTO_LIBS"
707707
AC_CHECK_HEADER([openssl/ec.h],, AC_MSG_ERROR(OpenSSL ec header missing),)
708-
709-
AC_MSG_CHECKING(for a supported OpenSSL version)
710-
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
711-
#include <openssl/rand.h>
712-
]],
713-
[[RAND_egd(NULL);]])],
714-
[AC_MSG_RESULT(yes)],
715-
[
716-
AC_ARG_WITH([libressl],
717-
[AS_HELP_STRING([--with-libressl],[Build with system LibreSSL (default is no; DANGEROUS; NOT SUPPORTED)])],
718-
[AC_MSG_WARN([Detected LibreSSL: This is NOT supported, and may break consensus compatibility!])],
719-
[AC_MSG_ERROR([Detected LibreSSL: This is NOT supported, and may break consensus compatibility!])]
720-
)]
721-
)
722-
723-
CFLAGS="$CFLAGS_TEMP"
708+
CXXFLAGS="$CXXFLAGS_TEMP"
724709
LIBS="$LIBS_TEMP"
725710

726711
BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)

0 commit comments

Comments
 (0)