[openssl] master update

Matt Caswell matt at openssl.org
Mon Jun 3 12:38:40 UTC 2019


The branch master has been updated
       via  bf5b04ea25d6ac7d31e388b4e87d3eb5cd1e1e2b (commit)
      from  cb30e46b45589166a83703f923aa89881dab1e0c (commit)


- Log -----------------------------------------------------------------
commit bf5b04ea25d6ac7d31e388b4e87d3eb5cd1e1e2b
Author: Mathias Berchtold <mberchtold at gmail.com>
Date:   Thu May 30 07:25:31 2019 +0200

    Add missing parentheses in macro
    
    Add missing parentheses in macro
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9044)

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

Summary of changes:
 include/openssl/opensslv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 73e64a7..0219d5f 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -78,7 +78,7 @@ extern "C" {
 
 /* For checking general API compatibility when preprocessing */
 # define OPENSSL_VERSION_PREREQ(maj,min)                                \
-    ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= (maj << 16) + min)
+    ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= ((maj) << 16) + (min))
 
 /* Helper macros for CPP string composition */
 #   define OPENSSL_MSTR_HELPER(x) #x


More information about the openssl-commits mailing list