tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Group libcrypto and PRNGD checks together. 

They're related more than the libcrypt or libiaf checks which are
currently between them.  ok djm@
This commit is contained in:
Darren Tucker 2022-07-22 09:51:51 +10:00
parent f117e372b3
commit d73f77b8cb
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
configure.ac
View File

@ -3224,26 +3224,6 @@ AC_CHECK_FUNCS([ \
arc4random_stir \ arc4random_stir \
arc4random_uniform \ arc4random_uniform \
]) ])
saved_LIBS="$LIBS"
AC_CHECK_LIB([iaf], [ia_openinfo], [
LIBS="$LIBS -liaf"
AC_CHECK_FUNCS([set_id], [SSHDLIBS="$SSHDLIBS -liaf"
AC_DEFINE([HAVE_LIBIAF], [1],
[Define if system has libiaf that supports set_id])
])
])
LIBS="$saved_LIBS"
# Check for crypt() in libcrypt. If we have it, we only need it for sshd.
saved_LIBS="$LIBS"
AC_CHECK_LIB([crypt], [crypt], [
LIBS="-lcrypt $LIBS"
SSHDLIBS="-lcrypt $SSHDLIBS"
])
AC_CHECK_FUNCS([crypt])
LIBS="$saved_LIBS"
### Configure cryptographic random number support ### Configure cryptographic random number support
# Check whether OpenSSL seeds itself # Check whether OpenSSL seeds itself
@ -3361,6 +3341,26 @@ else
AC_MSG_ERROR([OpenSSH has no source of random numbers. Please configure OpenSSL with an entropy source or re-run configure using one of the --with-prngd-port or --with-prngd-socket options]) AC_MSG_ERROR([OpenSSH has no source of random numbers. Please configure OpenSSL with an entropy source or re-run configure using one of the --with-prngd-port or --with-prngd-socket options])
fi fi
saved_LIBS="$LIBS"
AC_CHECK_LIB([iaf], [ia_openinfo], [
LIBS="$LIBS -liaf"
AC_CHECK_FUNCS([set_id], [SSHDLIBS="$SSHDLIBS -liaf"
AC_DEFINE([HAVE_LIBIAF], [1],
[Define if system has libiaf that supports set_id])
])
])
LIBS="$saved_LIBS"
# Check for crypt() in libcrypt. If we have it, we only need it for sshd.
saved_LIBS="$LIBS"
AC_CHECK_LIB([crypt], [crypt], [
LIBS="-lcrypt $LIBS"
SSHDLIBS="-lcrypt $SSHDLIBS"
])
AC_CHECK_FUNCS([crypt])
LIBS="$saved_LIBS"
# Check for PAM libs # Check for PAM libs
PAM_MSG="no" PAM_MSG="no"
AC_ARG_WITH([pam], AC_ARG_WITH([pam],