2021-06-08 14:58:25 +00:00
|
|
|
From b7700862a9a85e5bab302c158d5aa6ac1af7c5c1 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Omair Majid <omajid@redhat.com>
|
|
|
|
Date: Mon, 7 Jun 2021 11:37:48 -0400
|
2021-08-24 15:54:01 +00:00
|
|
|
Subject: [PATCH 09/11] Use `1` instead of `true` for more portable code
|
2021-06-08 14:58:25 +00:00
|
|
|
|
|
|
|
---
|
|
|
|
.../opensslshim.h | 14 +++++++-------
|
|
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h b/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
|
|
|
|
index c5052c1ba5..b0d1a71671 100644
|
|
|
|
--- a/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
|
|
|
|
+++ b/src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
|
|
|
|
@@ -91,9 +91,9 @@ void ERR_put_error(int32_t lib, int32_t func, int32_t reason, const char* file,
|
|
|
|
|
|
|
|
#ifdef FEATURE_DISTRO_AGNOSTIC_SSL
|
|
|
|
|
|
|
|
-#define NEED_OPENSSL_1_0 true
|
|
|
|
-#define NEED_OPENSSL_1_1 true
|
|
|
|
-#define NEED_OPENSSL_3_0 true
|
|
|
|
+#define NEED_OPENSSL_1_0 1
|
|
|
|
+#define NEED_OPENSSL_1_1 1
|
|
|
|
+#define NEED_OPENSSL_3_0 1
|
|
|
|
|
|
|
|
#if !HAVE_OPENSSL_EC2M
|
|
|
|
// In portable build, we need to support the following functions even if they were not present
|
|
|
|
@@ -991,14 +991,14 @@ FOR_ALL_OPENSSL_FUNCTIONS
|
|
|
|
|
|
|
|
#else // FEATURE_DISTRO_AGNOSTIC_SSL
|
|
|
|
|
|
|
|
-#define API_EXISTS(fn) true
|
|
|
|
+#define API_EXISTS(fn) 1
|
|
|
|
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= OPENSSL_VERSION_3_0_RTM
|
|
|
|
-#define NEED_OPENSSL_3_0 true
|
|
|
|
+#define NEED_OPENSSL_3_0 1
|
|
|
|
#elif OPENSSL_VERSION_NUMBER >= OPENSSL_VERSION_1_1_0_RTM
|
|
|
|
-#define NEED_OPENSSL_1_1 true
|
|
|
|
+#define NEED_OPENSSL_1_1 1
|
|
|
|
#else
|
|
|
|
-#define NEED_OPENSSL_1_0 true
|
|
|
|
+#define NEED_OPENSSL_1_0 1
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_3_0_RTM
|
|
|
|
--
|
|
|
|
2.31.1
|
|
|
|
|