[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  11642f35531e6afc5d6c4135c5e2ea6057e0e39a (commit)
       via  a4abcaeab8b0e1b01f76cddda70a437991c1ff57 (commit)
      from  c6048af23c577bcf85f15122dd03b65f959c9ecb (commit)


- Log -----------------------------------------------------------------
commit 11642f35531e6afc5d6c4135c5e2ea6057e0e39a
Author: David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Thu Jan 17 14:52:18 2019 +0100

    update Copyright date
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8036)

commit a4abcaeab8b0e1b01f76cddda70a437991c1ff57
Author: David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Wed Jan 16 15:38:34 2019 +0100

    add 'L' after _OPENSSL_VERSION_PRE_RELEASE literals, fixes #8021
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8036)

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

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

diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 08d9075..73e64a7 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -126,9 +126,9 @@ const char *OPENSSL_version_build_metadata(void);
 # if !OPENSSL_API_4
 /* 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)  \