OpenSSL: check for the SSLv2 function in configure

If no SSLv2 was detected in OpenSSL by configure, then we enforce the
OPENSSL_NO_SSL2 define as it seems some people report it not being
defined properly in the OpenSSL headers.

diff --git a/configure.ac b/configure.ac
index 94cdd83290e25b0bfe0fa7cd387bddd727b1292b..4bf25dcd863845ce69412e98f244ff11ed39d548 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1514,7 +1514,8 @@ if test X"$OPT_SSL" != Xno; then
                     RAND_egd \
                     ENGINE_cleanup \
                     CRYPTO_cleanup_all_ex_data \
-                    SSL_get_shutdown )
+                    SSL_get_shutdown \
+                    SSLv2_client_method )
 
     dnl Make an attempt to detect if this is actually yassl's headers and
     dnl OpenSSL emulation layer. We still leave everything else believing

diff --git a/lib/ssluse.c b/lib/ssluse.c
index af70fe08b852886aff2afe2e02ca09b5b2829e70..8deea26ae345734165848eec7fbde4bc1fec0436 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -127,6 +127,11 @@
 #define HAVE_ERR_REMOVE_THREAD_STATE 1
 #endif
 
+#ifndef HAVE_SSLV2_CLIENT_METHOD
+#undef OPENSSL_NO_SSL2 /* undef first to avoid compiler warnings */
+#define OPENSSL_NO_SSL2
+#endif
+
 /*
  * Number of bytes to read from the random number seed file. This must be
  * a finite value (because some entropy "files" like /dev/urandom have