diff options
author | vagrant <vagrant@debiantesting-64> | 2016-11-13 19:39:46 (GMT) |
---|---|---|
committer | Sven Nierlein <sven@nierlein.de> | 2016-11-13 21:14:02 (GMT) |
commit | fe1c4bb0e5ea3632d608a6b8b7e51d580856d833 (patch) | |
tree | 5fceabfc6f53b2bf7505bba099fa75d6cc8159bc /plugins/common.h | |
parent | 2f845e9ebc2b7bcf6472e0191752215d351e4e7c (diff) | |
download | monitoring-plugins-fe1c4bb0e5ea3632d608a6b8b7e51d580856d833.tar.gz |
add openssl 1.1 supportrefs/pull/1443/head
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 'plugins/common.h')
-rw-r--r-- | plugins/common.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/common.h b/plugins/common.h index 01003b3..8719b50 100644 --- a/plugins/common.h +++ b/plugins/common.h | |||
@@ -161,6 +161,13 @@ | |||
161 | # endif | 161 | # endif |
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | /* openssl 1.1 does not set OPENSSL_NO_SSL2 by default but ships without ssl2 */ | ||
165 | #ifdef OPENSSL_VERSION_NUMBER | ||
166 | # if OPENSSL_VERSION_NUMBER >= 0x10100000 | ||
167 | # define OPENSSL_NO_SSL2 | ||
168 | # endif | ||
169 | #endif | ||
170 | |||
164 | /* | 171 | /* |
165 | * | 172 | * |
166 | * Standard Values | 173 | * Standard Values |