openssl: define HAVE_SSL_GET_SHUTDOWN based on version number

Closes #4100

diff --git a/configure.ac b/configure.ac
index dc97ba108ec335461198a7fd4374085d5d19d784..cbf03808028235e4cc265c306d4cb3bb2bd49e75 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1826,13 +1826,9 @@ if test -z "$ssl_backends" -o "x$OPT_SSL" != xno &&
 
   if test X"$OPENSSL_ENABLED" = X"1"; then
     dnl These can only exist if OpenSSL exists
-    dnl Older versions of Cyassl (some time before 2.9.4) don't have
-    dnl SSL_get_shutdown (but this check won't actually detect it there
-    dnl as it's a macro that needs the header files be included)
     dnl OpenSSL_version is introduced in 3.0.0
 
     AC_CHECK_FUNCS( RAND_egd \
-                    SSL_get_shutdown \
                     SSLv2_client_method \
                     OpenSSL_version )
 

diff --git a/lib/config-symbian.h b/lib/config-symbian.h
index d23de332555091f850230191668d0b1ae8aa6647..b7b93c6f4c392a788f6dcbda3e830ebbe21acddf 100644 (file)
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -478,9 +478,6 @@
 /* Define to 1 if you have the `socket' function. */
 #define HAVE_SOCKET 1
 
-/* Define to 1 if you have the `SSL_get_shutdown' function. */
-/*#define HAVE_SSL_GET_SHUTDOWN 1*/
-
 /* Define to 1 if you have the <ssl.h> header file. */
 /* #undef HAVE_SSL_H */
 

diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h
index 8790f8266979ce790676f491400f1d6e1262193a..89af3525beba27dbd893dd9fdf8c88b9e594433d 100644 (file)
--- a/lib/config-vxworks.h
+++ b/lib/config-vxworks.h
@@ -541,9 +541,6 @@
 /* Define to 1 if you have the `socket' function. */
 #define HAVE_SOCKET 1
 
-/* Define to 1 if you have the `SSL_get_shutdown' function. */
-#define HAVE_SSL_GET_SHUTDOWN 1
-
 /* Define to 1 if you have the <ssl.h> header file. */
 /* #undef HAVE_SSL_H */
 

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 3d96c498c7750d4baa81a8686765b4d010766637..5458cbaca7dcba1bd90bf96584b7d55dea25fd13 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -587,9 +587,6 @@
 /* Define to 1 if you have the `socket' function. */
 #cmakedefine HAVE_SOCKET 1
 
-/* Define to 1 if you have the `SSL_get_shutdown' function. */
-#cmakedefine HAVE_SSL_GET_SHUTDOWN 1
-
 /* Define to 1 if you have the <ssl.h> header file. */
 #cmakedefine HAVE_SSL_H 1
 

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 1d2ec04ed3a73364ceafaecb65ae700e7043f27e..fb9f27123eaacd69d4d568837f6b1eb93ff08f6a 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -156,6 +156,10 @@
 #define HAVE_X509_GET0_SIGNATURE 1
 #endif
 
+#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) /* 1.0.2 or later */
+#define HAVE_SSL_GET_SHUTDOWN 1
+#endif
+
 #if OPENSSL_VERSION_NUMBER >= 0x10002003L && \
   OPENSSL_VERSION_NUMBER <= 0x10002FFFL && \
   !defined(OPENSSL_NO_COMP)

diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com
index 0f1fa0f6214bb39d4ac8cbbc8929fcba3dc1fa89..967eb40de14cb105e867f5cb2acfc2e1cae1501f 100644 (file)
--- a/packages/vms/config_h.com
+++ b/packages/vms/config_h.com
@@ -825,19 +825,6 @@ $      endif
 $          goto cfgh_in_loop1
 $      endif
 $!
-$      if key2 .eqs. "HAVE_SSL_GET_SHUTDOWN"
-$      then
-$          if f$search("''ssl_header_dir'ssl.h") .nes. ""
-$          then
-$              write tf "#ifndef ''key2'"
-$              write tf "#define ''key2' 1"
-$              write tf "#endif"
-$          else
-$              write tf "/* #undef ''key2' */"
-$          endif
-$          goto cfgh_in_loop1
-$      endif
-$!
 $      if key2b .eqs. "RAND" .and. key2c .nes. "" .and. key2d .eqs. ""
 $      then
 $          if (key2c .eqs. "EGD") .or. -