phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-11 20:32:35 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only use the libcrypto part of OpenSSL

Browse source
This commit is contained in:
Pieter Wuille 2014-09-01 19:45:51 +02:00
parent d531b04ea9
commit 3ed6dfae69
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -111,18 +111,16 @@ AC_DEFUN([SECP_OPENSSL_CHECK],[
if test x"$use_pkgconfig" = x"yes"; then if test x"$use_pkgconfig" = x"yes"; then
: #NOP : #NOP
m4_ifdef([PKG_CHECK_MODULES],[ m4_ifdef([PKG_CHECK_MODULES],[
PKG_CHECK_MODULES([SSL], [libssl], [has_libssl=yes; AC_DEFINE(HAVE_LIBSSL,1,[Define this symbol if libssl is installed])],[has_libssl=no])
PKG_CHECK_MODULES([CRYPTO], [libcrypto], [has_libcrypto=yes; AC_DEFINE(HAVE_LIBCRYPTO,1,[Define this symbol if libcrypto is installed])],[has_libcrypto=no]) PKG_CHECK_MODULES([CRYPTO], [libcrypto], [has_libcrypto=yes; AC_DEFINE(HAVE_LIBCRYPTO,1,[Define this symbol if libcrypto is installed])],[has_libcrypto=no])
: #NOP : #NOP
]) ])
else else
AC_CHECK_HEADER(openssl/ssl.h,[has_libssl=yes; AC_DEFINE(HAVE_LIBSSL,1,[Define this symbol if libssl is installed])])
AC_CHECK_HEADER(openssl/crypto.h,[AC_CHECK_LIB(crypto, main,[has_libcrypto=yes; CRYPTO_LIBS=-lcrypto; AC_DEFINE(HAVE_LIBCRYPTO,1,[Define this symbol if libcrypto is installed])] AC_CHECK_HEADER(openssl/crypto.h,[AC_CHECK_LIB(crypto, main,[has_libcrypto=yes; CRYPTO_LIBS=-lcrypto; AC_DEFINE(HAVE_LIBCRYPTO,1,[Define this symbol if libcrypto is installed])]
)]) )])
LIBS= LIBS=
fi fi
if test x"$has_libssl" == x"yes" && test x"$has_openssl_ec" = x; then if test x"$has_libcrypto" == x"yes" && test x"$has_openssl_ec" = x; then
AC_MSG_CHECKING(for EC functions in libssl) AC_MSG_CHECKING(for EC functions in libcrypto)
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <openssl/ec.h> #include <openssl/ec.h>
#include <openssl/ecdsa.h> #include <openssl/ecdsa.h>
@ -135,9 +133,6 @@ if test x"$has_libssl" == x"yes" && test x"$has_openssl_ec" = x; then
AC_MSG_RESULT([$has_openssl_ec]) AC_MSG_RESULT([$has_openssl_ec])
fi fi
if test x"$set_bignum" = x"openssl"; then if test x"$set_bignum" = x"openssl"; then
if test x"$has_libssl" != x"yes"; then
AC_MSG_ERROR([$set_bignum field support explicitly requested but libssl was not found])
fi
if test x"$has_libcrypto" != x"yes"; then if test x"$has_libcrypto" != x"yes"; then
AC_MSG_ERROR([$set_bignum field support explicitly requested but libcrypto was not found]) AC_MSG_ERROR([$set_bignum field support explicitly requested but libcrypto was not found])
fi fi
@ -209,7 +204,7 @@ if test x"$req_bignum" = x"auto"; then
if test x"$set_bignum" = x; then if test x"$set_bignum" = x; then
SECP_OPENSSL_CHECK SECP_OPENSSL_CHECK
if test x"$has_libssl" = x"yes"; then if test x"$has_libcrypto" = x"yes"; then
set_bignum=openssl set_bignum=openssl
fi fi
fi fi