1From bd59be8e4e339870a1400f6866a7b73ca11f6460 Mon Sep 17 00:00:00 2001 2From: Giulio Benetti <giulio.benetti@micronovasrl.com> 3Date: Wed, 12 Sep 2018 20:16:39 +0200 4Subject: [PATCH] configure, static linking: Fix SSL checks 5 6During checking of DTLS_method, the stub program is linked only with -ssl 7libssl.a lacks some function from -lcrypto: 8RAND_*() 9ERR_*() 10BUF_MEM_*() 11etc. 12and -lz: 13- inflate() 14- deflate() 15 16Append -lcrypto and -lz to LIBS variable when checking DTLS_method. 17 18See also https://sourceforge.net/p/net-snmp/patches/1374/. 19 20Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> 21[bvanassche: Edited subject / rewrote this patch] 22[yann.morin.1998@free.fr: 23 - use an actual backport of bd59be8e4e339870a1400f6866a7b73ca11f6460 24] 25Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> 26--- 27 configure | 52 ++++++++++++++++++++++++++++++++++--- 28 configure.d/config_os_libs2 | 14 +++++++--- 29 2 files changed, 58 insertions(+), 8 deletions(-) 30 31diff --git a/configure b/configure 32index 6504a8e58a..1116cecaad 100755 33--- a/configure 34+++ b/configure 35@@ -23228,16 +23228,60 @@ fi 36 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 37 $as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } 38 if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : 39- CRYPTO="crypto" 40+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto" 41+else 42+ 43+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 44+$as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } 45+if ${ac_cv_lib_crypto_EVP_md5+:} false; then : 46+ $as_echo_n "(cached) " >&6 47+else 48+ ac_check_lib_save_LIBS=$LIBS 49+LIBS="-lcrypto -lz $LIBS" 50+cat confdefs.h - <<_ACEOF >conftest.$ac_ext 51+/* end confdefs.h. */ 52+ 53+/* Override any GCC internal prototype to avoid an error. 54+ Use char because int might match the return type of a GCC 55+ builtin and then its argument prototype would still apply. */ 56+#ifdef __cplusplus 57+extern "C" 58+#endif 59+char EVP_md5 (); 60+int 61+main () 62+{ 63+return EVP_md5 (); 64+ ; 65+ return 0; 66+} 67+_ACEOF 68+if ac_fn_c_try_link "$LINENO"; then : 69+ ac_cv_lib_crypto_EVP_md5=yes 70+else 71+ ac_cv_lib_crypto_EVP_md5=no 72+fi 73+rm -f core conftest.err conftest.$ac_objext \ 74+ conftest$ac_exeext conftest.$ac_ext 75+LIBS=$ac_check_lib_save_LIBS 76+fi 77+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 78+$as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } 79+if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : 80+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz" 81+fi 82+ 83+ 84 fi 85 86- fi 87+ else 88+ LIBCRYPTO="-l${CRYPTO}" 89+ fi 90 91 if test x$CRYPTO != x; then 92 93 $as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h 94 95- LIBCRYPTO="-l${CRYPTO}" 96 netsnmp_save_LIBS="$LIBS" 97 LIBS="$LIBCRYPTO" 98 for ac_func in AES_cfb128_encrypt EVP_sha224 EVP_sha384 EVP_MD_CTX_create EVP_MD_CTX_destroy EVP_MD_CTX_new EVP_MD_CTX_free DH_set0_pqg DH_get0_pqg DH_get0_key ASN1_STRING_get0_data X509_NAME_ENTRY_get_object X509_NAME_ENTRY_get_data X509_get_signature_nid 99@@ -23291,7 +23335,7 @@ _ACEOF 100 LIBS="$netsnmp_save_LIBS" 101 fi 102 netsnmp_save_LIBS="$LIBS" 103- LIBS="-lssl" 104+ LIBS="-lssl $LIBCRYPTO" 105 for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings ERR_get_error_all 106 do : 107 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 108diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 109index 4a1ad1551f..75214cfff3 100644 110--- a/configure.d/config_os_libs2 111+++ b/configure.d/config_os_libs2 112@@ -306,13 +306,19 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then 113 LIBS="$netsnmp_save_LIBS" 114 115 if test x$CRYPTO = x; then 116- AC_CHECK_LIB([crypto], [EVP_md5], [CRYPTO="crypto"]) 117- fi 118+ AC_CHECK_LIB([crypto], [EVP_md5], 119+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ 120+ AC_CHECK_LIB([crypto], [EVP_md5], 121+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], 122+ [-lz]) 123+ ]) 124+ else 125+ LIBCRYPTO="-l${CRYPTO}" 126+ fi 127 128 if test x$CRYPTO != x; then 129 AC_DEFINE(HAVE_LIBCRYPTO, 1, 130 [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) 131- LIBCRYPTO="-l${CRYPTO}" 132 netsnmp_save_LIBS="$LIBS" 133 LIBS="$LIBCRYPTO" 134 AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl 135@@ -342,7 +348,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then 136 LIBS="$netsnmp_save_LIBS" 137 fi 138 netsnmp_save_LIBS="$LIBS" 139- LIBS="-lssl" 140+ LIBS="-lssl $LIBCRYPTO" 141 AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl 142 [SSL_library_init SSL_load_error_strings]) 143 LIBS="$netsnmp_save_LIBS" 144-- 1452.25.1 146 147