[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  500a7615173c8ae2362a05e1affd376ab2b41a94 (commit)
      from  35774d5594af9beeb73792742b7ed901d202be70 (commit)


- Log -----------------------------------------------------------------
commit 500a7615173c8ae2362a05e1affd376ab2b41a94
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue May 5 09:52:25 2020 +0200

    The synthesized OPENSSL_VERSION_NUMBER must be long
    
    (to keep API compatibility with older releases)
    
    Fixes #11716
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/11732)

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/opensslv.h.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)        \