PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-10 17:59:04 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused checks for OpenSSL from nbase

Browse Source
This commit is contained in:
dmiller
2023-10-30 19:01:08 +00:00
parent ef71e5e37d
commit 6959060fe6
4 changed files with 0 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
nbase/configure vendored
View File

@@ -684,7 +684,6 @@ ac_user_opts='
enable_option_checking enable_option_checking
with_localdirs with_localdirs
enable_ipv6 enable_ipv6
with_openssl
' '
ac_precious_vars='build_alias ac_precious_vars='build_alias
host_alias host_alias
@@ -1323,8 +1322,6 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-localdirs Explicitly ask compiler to use /usr/local/{include,libs} if they exist --with-localdirs Explicitly ask compiler to use /usr/local/{include,libs} if they exist
--with-openssl=DIR Use optional openssl libs and includes from DIR/lib/
and DIR/include/openssl/)
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
@@ -5075,186 +5072,6 @@ if test "$have_ipv6" = "1"; then
$as_echo "#define HAVE_IPV6 1" >>confdefs.h $as_echo "#define HAVE_IPV6 1" >>confdefs.h
fi
# First we test whether they specified openssl desires explicitly
use_openssl="yes"
specialssldir=""
# Check whether --with-openssl was given.
if test "${with_openssl+set}" = set; then :
withval=$with_openssl; case "$with_openssl" in
yes)
;;
no)
use_openssl="no"
;;
*)
specialssldir="$with_openssl"
;;
esac
fi
# If they didn't specify it, we try to find it
if test "$use_openssl" = "yes" -a -z "$specialssldir"; then
ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
else
use_openssl="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find openssl/ssl.h so OpenSSL will not be used. If it
is installed you can try the --with-openssl=DIR argument" >&5
$as_echo "$as_me: WARNING: Failed to find openssl/ssl.h so OpenSSL will not be used. If it
is installed you can try the --with-openssl=DIR argument" >&2;}
fi
if test "$use_openssl" = "yes"; then
ac_fn_c_check_header_mongrel "$LINENO" "openssl/err.h" "ac_cv_header_openssl_err_h" "$ac_includes_default"
if test "x$ac_cv_header_openssl_err_h" = xyes; then :
else
use_openssl="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find openssl/err.h so OpenSSL will not be used. If it
is installed you can try the --with-openssl=DIR argument" >&5
$as_echo "$as_me: WARNING: Failed to find openssl/err.h so OpenSSL will not be used. If it
is installed you can try the --with-openssl=DIR argument" >&2;}
fi
fi
if test "$use_openssl" = "yes"; then
ac_fn_c_check_header_mongrel "$LINENO" "openssl/rand.h" "ac_cv_header_openssl_rand_h" "$ac_includes_default"
if test "x$ac_cv_header_openssl_rand_h" = xyes; then :
else
use_openssl="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find openssl/rand.h so OpenSSL will not be used. If i
t is installed you can try the --with-openssl=DIR argument" >&5
$as_echo "$as_me: WARNING: Failed to find openssl/rand.h so OpenSSL will not be used. If i
t is installed you can try the --with-openssl=DIR argument" >&2;}
fi
fi
if test "$use_openssl" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_int_ctrl in -lcrypto" >&5
$as_echo_n "checking for BIO_int_ctrl in -lcrypto... " >&6; }
if ${ac_cv_lib_crypto_BIO_int_ctrl+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char BIO_int_ctrl ();
int
main ()
{
return BIO_int_ctrl ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_crypto_BIO_int_ctrl=yes
else
ac_cv_lib_crypto_BIO_int_ctrl=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BIO_int_ctrl" >&5
$as_echo "$ac_cv_lib_crypto_BIO_int_ctrl" >&6; }
if test "x$ac_cv_lib_crypto_BIO_int_ctrl" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1
_ACEOF
LIBS="-lcrypto $LIBS"
else
use_openssl="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find libcrypto so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument" >&5
$as_echo "$as_me: WARNING: Failed to find libcrypto so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument" >&2;}
fi
fi
if test "$use_openssl" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
$as_echo_n "checking for SSL_new in -lssl... " >&6; }
if ${ac_cv_lib_ssl_SSL_new+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lssl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SSL_new ();
int
main ()
{
return SSL_new ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ssl_SSL_new=yes
else
ac_cv_lib_ssl_SSL_new=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSSL 1
_ACEOF
LIBS="-lssl $LIBS"
else
use_openssl="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find libssl so OpenSSL will not be used. If it is ins
talled you can try the --with-openssl=DIR argument" >&5
$as_echo "$as_me: WARNING: Failed to find libssl so OpenSSL will not be used. If it is ins
talled you can try the --with-openssl=DIR argument" >&2;}
fi
fi
fi
if test "$use_openssl" = "yes"; then
$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
fi fi

61
nbase/configure.ac
View File

@@ -234,67 +234,6 @@ if test "$have_ipv6" = "1"; then
AC_DEFINE(HAVE_IPV6, 1, [define if IPv6 is available]) AC_DEFINE(HAVE_IPV6, 1, [define if IPv6 is available])
fi fi
# First we test whether they specified openssl desires explicitly
use_openssl="yes"
specialssldir=""
AC_ARG_WITH(openssl,
[ --with-openssl=DIR Use optional openssl libs and includes from [DIR]/lib/
and [DIR]/include/openssl/)],
[ case "$with_openssl" in
yes)
;;
no)
use_openssl="no"
;;
*)
specialssldir="$with_openssl"
;;
esac]
)
# If they didn't specify it, we try to find it
if test "$use_openssl" = "yes" -a -z "$specialssldir"; then
AC_CHECK_HEADER(openssl/ssl.h,,
[ use_openssl="no"
AC_MSG_WARN([Failed to find openssl/ssl.h so OpenSSL will not be used. If it
is installed you can try the --with-openssl=DIR argument]) ])
if test "$use_openssl" = "yes"; then
AC_CHECK_HEADER(openssl/err.h,,
[ use_openssl="no"
AC_MSG_WARN([Failed to find openssl/err.h so OpenSSL will not be used. If it
is installed you can try the --with-openssl=DIR argument]) ])
fi
if test "$use_openssl" = "yes"; then
AC_CHECK_HEADER(openssl/rand.h,,
[ use_openssl="no"
AC_MSG_WARN([Failed to find openssl/rand.h so OpenSSL will not be used. If i
t is installed you can try the --with-openssl=DIR argument]) ])
fi
if test "$use_openssl" = "yes"; then
AC_CHECK_LIB(crypto, BIO_int_ctrl,
[],
[ use_openssl="no"
AC_MSG_WARN([Failed to find libcrypto so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument]) ])
fi
if test "$use_openssl" = "yes"; then
AC_CHECK_LIB(ssl, SSL_new,
[],
[ use_openssl="no"
AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used. If it is ins
talled you can try the --with-openssl=DIR argument]) ])
fi
fi
if test "$use_openssl" = "yes"; then
AC_DEFINE(HAVE_OPENSSL, 1, [define if libssl is available])
fi
CHECK_PROC_SELF_EXE CHECK_PROC_SELF_EXE
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)

2
nbase/nbase_config.h.in
View File

@@ -189,8 +189,6 @@
/* define if your compiler has __attribute__ */ /* define if your compiler has __attribute__ */
#undef HAVE___ATTRIBUTE__ #undef HAVE___ATTRIBUTE__
#undef HAVE_OPENSSL
#undef HAVE_PROC_SELF_EXE #undef HAVE_PROC_SELF_EXE
#undef LINUX #undef LINUX

3
nbase/nbase_winconfig.h
View File

@@ -147,9 +147,6 @@ typedef signed __int64 int64_t;
#define __attribute__(x) #define __attribute__(x)
#endif #endif
#define HAVE_OPENSSL 1
#define HAVE_DTLS_CLIENT_METHOD 1
#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1
/* Apparently __func__ isn't yet supported */ /* Apparently __func__ isn't yet supported */
#define __func__ __FUNCTION__ #define __func__ __FUNCTION__