From cc5c80eb4d6f98b94f20e5abd4cd50c5bf0e5a44 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sat, 20 Nov 2021 16:48:10 +0100
Subject: wolfSSL: support 5.0.0+.

---
 tls-aux.h | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'tls-aux.h')

diff --git a/tls-aux.h b/tls-aux.h
index 696020a3..0d6bac48 100644
--- a/tls-aux.h
+++ b/tls-aux.h
@@ -1,25 +1,37 @@
 #ifndef TLS_AUX_H
 #define TLS_AUX_H 1
 
+#undef LIBWOLFSSL_VERSION_STRING
+
 #include "config.h"
 #include "fetchmail.h"
 
-
 #ifdef SSL_ENABLE
-#include <openssl/opensslv.h>
 
-# if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x1010000fL
-#  undef OSSL110_API
-# else
-#  define OSSL110_API 1
-# endif
-# if OPENSSL_VERSION_NUMBER < 0x1010000fL
-#  define OpenSSL_version(t) SSLeay_version((t))
-#  define OpenSSL_version_num() SSLeay()
-#  define OPENSSL_VERSION (SSLEAY_VERSION)
-#  define OPENSSL_DIR (SSLEAY_DIR)
-#  define OPENSSL_ENGINES_DIR (-1)
+# ifdef HAVE_WOLFSSL_OPTIONS_H
+#  include <wolfssl/options.h>
 # endif
+
+# include <openssl/ssl.h>
+
+# undef USING_WOLFSSL
+# ifdef LIBWOLFSSL_VERSION_HEX
+#  define USING_WOLFSSL 1
+#  define OSSL110_API 1
+# else
+#  if OPENSSL_VERSION_NUMBER < 0x1010000fL
+#   undef OSSL110_API
+#  else
+#   define OSSL110_API 1
+#  endif
+#  if OPENSSL_VERSION_NUMBER < 0x1010000fL
+#   define OpenSSL_version(t) SSLeay_version((t))
+#   define OpenSSL_version_num() SSLeay()
+#   define OPENSSL_VERSION (SSLEAY_VERSION)
+#   define OPENSSL_DIR (SSLEAY_DIR)
+#   define OPENSSL_ENGINES_DIR (-1)
+#  endif
+# endif /* LIBWOLFSSL_VERSION_STRING */
 #endif /* SSL_ENABLE */
 
 #endif /* TLS_AUX_H */
-- 
cgit v1.2.3