37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
|
From 033ea5b4e5f8f1248f74a2ec61fc1be183c6c46b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Joachim Metz <joachim.metz@gmail.com>
|
||
|
|
Date: Thu, 18 Nov 2021 06:51:25 +0100
|
||
|
|
Subject: [PATCH] Changes for building with OpenSSL 3 #164
|
||
|
|
|
||
|
|
---
|
||
|
|
ewftools/ewftools_output.c | 12 +++++++++++-
|
||
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ewftools/ewftools_output.c b/ewftools/ewftools_output.c
|
||
|
|
index 07ef5e24..07312055 100644
|
||
|
|
--- a/ewftools/ewftools_output.c
|
||
|
|
+++ b/ewftools/ewftools_output.c
|
||
|
|
@@ -238,11 +238,21 @@ void ewftools_output_version_detailed_fprint(
|
||
|
|
LIBHMAC_VERSION_STRING );
|
||
|
|
|
||
|
|
#if defined( HAVE_LIBCRYPTO )
|
||
|
|
+#if defined( SHLIB_VERSION_NUMBER )
|
||
|
|
fprintf(
|
||
|
|
stream,
|
||
|
|
" (libcrypto %s)",
|
||
|
|
SHLIB_VERSION_NUMBER );
|
||
|
|
-#endif
|
||
|
|
+
|
||
|
|
+#elif defined( OPENSSL_VERSION_MAJOR ) && defined( OPENSSL_VERSION_MINOR )
|
||
|
|
+ fprintf(
|
||
|
|
+ stream,
|
||
|
|
+ " (libcrypto %d.%d)",
|
||
|
|
+ OPENSSL_VERSION_MAJOR,
|
||
|
|
+ OPENSSL_VERSION_MINOR );
|
||
|
|
+
|
||
|
|
+#endif /* defined( SHLIB_VERSION_NUMBER ) */
|
||
|
|
+#endif /* defined( HAVE_LIBCRYPTO ) */
|
||
|
|
#endif /* defined( HAVE_LIBHMAC ) || defined( HAVE_LOCAL_LIBHMAC ) */
|
||
|
|
|
||
|
|
#if defined( HAVE_LIBODRAW ) || defined( HAVE_LOCAL_LIBODRAW )
|