File 1634-crypto-Adapt-to-OpenSSL-3.0-versioning.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1634-crypto-Adapt-to-OpenSSL-3.0-versioning.patch of Package erlang (Revision 3e585b5159e575cdaf8b197320891957)

Currently displaying revision 3e585b5159e575cdaf8b197320891957 , Show latest

From 260409754416c53d90befebdcf3cc3dc8ecadcc4 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 12 Oct 2021 18:02:59 +0200
Subject: [PATCH 04/17] crypto: Adapt to OpenSSL 3.0 versioning

keeping the legacy style for compatibility
---
 lib/crypto/c_src/openssl_version.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/crypto/c_src/openssl_version.h b/lib/crypto/c_src/openssl_version.h
index 0fb26af7ff..5ed36ef9d6 100644
--- a/lib/crypto/c_src/openssl_version.h
+++ b/lib/crypto/c_src/openssl_version.h
@@ -30,8 +30,20 @@
 /* Helper macros to construct a OPENSSL_VERSION_NUMBER.
  * See openssl/opensslv.h
  */
-#define PACKED_OPENSSL_VERSION(MAJ, MIN, FIX, P)	\
-    ((((((((MAJ << 8) | MIN) << 8 ) | FIX) << 8) | (P-'a'+1)) << 4) | 0xf)
+
+#if !defined(HAS_LIBRESSL) && \
+    defined(OPENSSL_VERSION_MAJOR) && \
+    (OPENSSL_VERSION_MAJOR >= 3)
+
+# define PACKED_OPENSSL_VERSION(MAJ, MIN, PATCH, VOID)   \
+         (((((MAJ << 8) | MIN) << 16 ) | PATCH) << 4)
+#else
+/* Pre 3.0.0 */
+#  define PACKED_OPENSSL_VERSION(MAJ, MIN, FIX, P)                        \
+          ((((((((MAJ << 8) | MIN) << 8 ) | FIX) << 8) | (P-'a'+1)) << 4) | 0xf)
+
+/* End Pre 3.0.0 */
+#endif
 
 #define PACKED_OPENSSL_VERSION_PLAIN(MAJ, MIN, FIX) \
     PACKED_OPENSSL_VERSION(MAJ,MIN,FIX,('a'-1))
-- 
2.31.1

Places

File 1634-crypto-Adapt-to-OpenSSL-3.0-versioning.patch of Package erlang (Revision 3e585b5159e575cdaf8b197320891957)

Places