From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Tue, 5 May 2020 07:52:25 +0000 (+0200)
Subject: The synthesized OPENSSL_VERSION_NUMBER must be long
X-Git-Tag: openssl-3.0.0-alpha2~75
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=500a7615173c8ae2362a05e1affd376ab2b41a94;p=oweals%2Fopenssl.git

The synthesized OPENSSL_VERSION_NUMBER must be long

(to keep API compatibility with older releases)

Fixes #11716

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11732)
---

diff --git a/include/openssl/opensslv.h.in b/include/openssl/opensslv.h.in
index ffd2bfff32..d9eee21c2d 100644
--- a/include/openssl/opensslv.h.in
+++ b/include/openssl/opensslv.h.in
@@ -91,9 +91,9 @@ extern "C" {
 
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 # ifdef OPENSSL_VERSION_PRE_RELEASE
-#  define _OPENSSL_VERSION_PRE_RELEASE 0x0
+#  define _OPENSSL_VERSION_PRE_RELEASE 0x0L
 # else
-#  define _OPENSSL_VERSION_PRE_RELEASE 0xf
+#  define _OPENSSL_VERSION_PRE_RELEASE 0xfL
 # endif
 # define OPENSSL_VERSION_NUMBER          \
     ( (OPENSSL_VERSION_MAJOR<<28)        \