mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-28 12:57:50 +00:00
Code Issues Releases Wiki Activity

When using pkg-config, don't assume the names of the ssl and crypto libs.

Browse Source 
On the HP-UX build machines these are named libssl_pic.a and
libcrypto_pic.a to avoid conflicting with the system libs.
This commit is contained in:
Todd C. Miller 2021-09-17 10:55:06 -06:00
parent 4289e9609d
commit 78eb240642
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
configure vendored
View File

@ -23299,6 +23299,7 @@ if test "${enable_openssl-no}" != no; then
fi fi
: ${PKG_CONFIG='pkg-config'} : ${PKG_CONFIG='pkg-config'}
pkg_openssl=`printf $enable_openssl_pkgconfig_template "openssl"` pkg_openssl=`printf $enable_openssl_pkgconfig_template "openssl"`
pkg_libcrypto=lib`printf $enable_openssl_pkgconfig_template "crypto"`
if $PKG_CONFIG --exists "$pkg_openssl >= 1.0.1" >/dev/null 2>&1; then if $PKG_CONFIG --exists "$pkg_openssl >= 1.0.1" >/dev/null 2>&1; then
printf "%s\n" "#define HAVE_OPENSSL 1" >>confdefs.h printf "%s\n" "#define HAVE_OPENSSL 1" >>confdefs.h
@ -23308,15 +23309,19 @@ if test "${enable_openssl-no}" != no; then
O_LDFLAGS="$LDFLAGS" O_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs-only-L $pkg_openssl`" LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs-only-L $pkg_openssl`"
# Check whether --static is needed # Check whether --static is needed (don't assume name of ssl lib)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5 libssl="`$PKG_CONFIG --libs-only-l $pkg_openssl | sed 's/^ *-l//'`"
printf %s "checking for SSL_new in -lssl... " >&6; } libssl_extra=`echo $libssl | sed 's/^[^ ]* *//'`
if test ${ac_cv_lib_ssl_SSL_new_lcrypto+y} libssl=`echo $libssl | sed 's/ .*//'`
as_ac_Lib=`printf "%s\n" "ac_cv_lib_$libssl''_SSL_new$libssl_extra" | $as_tr_sh`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -l$libssl" >&5
printf %s "checking for SSL_new in -l$libssl... " >&6; }
if eval test \${$as_ac_Lib+y}
then : then :
printf %s "(cached) " >&6 printf %s "(cached) " >&6
else $as_nop else $as_nop
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lssl -lcrypto $LIBS" LIBS="-l$libssl $libssl_extra $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -23334,17 +23339,18 @@ return SSL_new ();
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO" if ac_fn_c_try_link "$LINENO"
then : then :
ac_cv_lib_ssl_SSL_new_lcrypto=yes eval "$as_ac_Lib=yes"
else $as_nop else $as_nop
ac_cv_lib_ssl_SSL_new_lcrypto=no eval "$as_ac_Lib=no"
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \ rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new_lcrypto" >&5 eval ac_res=\$$as_ac_Lib
printf "%s\n" "$ac_cv_lib_ssl_SSL_new_lcrypto" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
if test "x$ac_cv_lib_ssl_SSL_new_lcrypto" = xyes printf "%s\n" "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"
then : then :
STATIC="" STATIC=""
else $as_nop else $as_nop
@ -23352,15 +23358,17 @@ else $as_nop
fi fi
# Use OpenSSL's sha2 functions if possible # Use OpenSSL's sha2 functions if possible (don't assume name of crypto)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EVP_MD_CTX_new in -lcrypto" >&5 libcrypto="`$PKG_CONFIG --libs-only-l $pkg_libcrypto | sed -e 's/^ *-l//' -e 's/ .*//'`"
printf %s "checking for EVP_MD_CTX_new in -lcrypto... " >&6; } as_ac_Lib=`printf "%s\n" "ac_cv_lib_$libcrypto''_EVP_MD_CTX_new" | $as_tr_sh`
if test ${ac_cv_lib_crypto_EVP_MD_CTX_new+y} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EVP_MD_CTX_new in -l$libcrypto" >&5
printf %s "checking for EVP_MD_CTX_new in -l$libcrypto... " >&6; }
if eval test \${$as_ac_Lib+y}
then : then :
printf %s "(cached) " >&6 printf %s "(cached) " >&6
else $as_nop else $as_nop
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS" LIBS="-l$libcrypto $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -23378,17 +23386,18 @@ return EVP_MD_CTX_new ();
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO" if ac_fn_c_try_link "$LINENO"
then : then :
ac_cv_lib_crypto_EVP_MD_CTX_new=yes eval "$as_ac_Lib=yes"
else $as_nop else $as_nop
ac_cv_lib_crypto_EVP_MD_CTX_new=no eval "$as_ac_Lib=no"
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \ rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_MD_CTX_new" >&5 eval ac_res=\$$as_ac_Lib
printf "%s\n" "$ac_cv_lib_crypto_EVP_MD_CTX_new" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
if test "x$ac_cv_lib_crypto_EVP_MD_CTX_new" = xyes printf "%s\n" "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"
then : then :
DIGEST=digest_openssl.lo DIGEST=digest_openssl.lo
fi fi
@ -23509,7 +23518,6 @@ fi
esac esac
done done
if test "$DIGEST" = "digest_openssl.lo"; then if test "$DIGEST" = "digest_openssl.lo"; then
pkg_libcrypto=lib`printf $enable_openssl_pkgconfig_template "crypto"`
if $PKG_CONFIG --exists $pkg_libcrypto >/dev/null 2>&1; then if $PKG_CONFIG --exists $pkg_libcrypto >/dev/null 2>&1; then
LIBMD=`$PKG_CONFIG $STATIC --libs $pkg_libcrypto` LIBMD=`$PKG_CONFIG $STATIC --libs $pkg_libcrypto`
for f in `$PKG_CONFIG $STATIC --libs $pkg_libcrypto`; do for f in `$PKG_CONFIG $STATIC --libs $pkg_libcrypto`; do

14
configure.ac
View File

@ -2945,6 +2945,7 @@ if test "${enable_openssl-no}" != no; then
fi fi
: ${PKG_CONFIG='pkg-config'} : ${PKG_CONFIG='pkg-config'}
pkg_openssl=`printf $enable_openssl_pkgconfig_template "openssl"` pkg_openssl=`printf $enable_openssl_pkgconfig_template "openssl"`
pkg_libcrypto=lib`printf $enable_openssl_pkgconfig_template "crypto"`
if $PKG_CONFIG --exists "$pkg_openssl >= 1.0.1" >/dev/null 2>&1; then if $PKG_CONFIG --exists "$pkg_openssl >= 1.0.1" >/dev/null 2>&1; then
AC_DEFINE(HAVE_OPENSSL) AC_DEFINE(HAVE_OPENSSL)
if test "$enable_openssl" = "maybe"; then if test "$enable_openssl" = "maybe"; then
@ -2953,11 +2954,15 @@ if test "${enable_openssl-no}" != no; then
O_LDFLAGS="$LDFLAGS" O_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs-only-L $pkg_openssl`" LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs-only-L $pkg_openssl`"
# Check whether --static is needed # Check whether --static is needed (don't assume name of ssl lib)
AC_CHECK_LIB(ssl, SSL_new, [STATIC=""], [STATIC="--static"], [-lcrypto]) libssl="`$PKG_CONFIG --libs-only-l $pkg_openssl | sed 's/^ *-l//'`"
libssl_extra=`echo $libssl | sed 's/^[[^ ]]* *//'`
libssl=`echo $libssl | sed 's/ .*//'`
AC_CHECK_LIB($libssl, SSL_new, [STATIC=""], [STATIC="--static"], [$libssl_extra])
# Use OpenSSL's sha2 functions if possible # Use OpenSSL's sha2 functions if possible (don't assume name of crypto)
AC_CHECK_LIB(crypto, EVP_MD_CTX_new, [DIGEST=digest_openssl.lo]) libcrypto="`$PKG_CONFIG --libs-only-l $pkg_libcrypto | sed -e 's/^ *-l//' -e 's/ .*//'`"
AC_CHECK_LIB($libcrypto, EVP_MD_CTX_new, [DIGEST=digest_openssl.lo])
LDFLAGS="$O_LDFLAGS" LDFLAGS="$O_LDFLAGS"
# Use pkg-config to determine OpenSSL libs and cflags # Use pkg-config to determine OpenSSL libs and cflags
@ -2973,7 +2978,6 @@ if test "${enable_openssl-no}" != no; then
esac esac
done done
if test "$DIGEST" = "digest_openssl.lo"; then if test "$DIGEST" = "digest_openssl.lo"; then
pkg_libcrypto=lib`printf $enable_openssl_pkgconfig_template "crypto"`
if $PKG_CONFIG --exists $pkg_libcrypto >/dev/null 2>&1; then if $PKG_CONFIG --exists $pkg_libcrypto >/dev/null 2>&1; then
LIBMD=`$PKG_CONFIG $STATIC --libs $pkg_libcrypto` LIBMD=`$PKG_CONFIG $STATIC --libs $pkg_libcrypto`
for f in `$PKG_CONFIG $STATIC --libs $pkg_libcrypto`; do for f in `$PKG_CONFIG $STATIC --libs $pkg_libcrypto`; do