diff options
| author |  vagrant <vagrant@debiantesting-64>
| 2016-11-13 19:39:46 +0000 |
|---|---|---|
| committer |  Sven Nierlein <sven@nierlein.de>
| 2016-11-13 21:14:02 +0000 |
| commit | fe1c4bb0e5ea3632d608a6b8b7e51d580856d833 (patch) | |
| tree | 5fceabfc6f53b2bf7505bba099fa75d6cc8159bc /configure.ac | |
| parent | 2f845e9ebc2b7bcf6472e0191752215d351e4e7c (diff) | |
| download | monitoring-plugins-fe1c4bb0e5ea3632d608a6b8b7e51d580856d833.tar.gz | |
add openssl 1.1 support
changes:
- CRYPTO_lock detection replaced in configure.ac. We don't use that
function anywhere, so just replace it with the suggested one from
https://wiki.openssl.org/index.php/Library_Initialization#Autoconf
- OPENSSL_NO_SSL2 is no longer defined while ssl2 is not included.
Set it ourself using the suggested openssl 1.1 version check from
https://wiki.openssl.org/index.php/1.1_API_Changes#Backward_compatibility
- openssl 1.1 sends a sigpipe if the connection is still open when
calling SSL_shutdown(), so move the close before the shutdown.
Signed-off-by: Sven Nierlein <sven@nierlein.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0a554af6..5ef56f75 100644 --- a/configure.ac +++ b/configure.ac @@ -493,15 +493,15 @@ if ! test x"$with_openssl" = x"no"; then dnl Check for crypto lib _SAVEDLIBS="$LIBS" LIBS="-L${with_openssl}/lib" - AC_CHECK_LIB(crypto,CRYPTO_lock) - if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then + AC_CHECK_LIB(crypto,CRYPTO_new_ex_data) + if test "$ac_cv_lib_crypto_CRYPTO_new_ex_data" = "yes"; then dnl Check for SSL lib AC_CHECK_LIB(ssl,main, SSLLIBS="-lssl -lcrypto",,-lcrypto) fi LIBS="$_SAVEDLIBS" dnl test headers and libs to decide whether check_http should use SSL - if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then + if test "$ac_cv_lib_crypto_CRYPTO_new_ex_data" = "yes"; then if test "$ac_cv_lib_ssl_main" = "yes"; then if test "$FOUNDINCLUDE" = "yes"; then FOUNDOPENSSL="yes" |