[openssl] master update

Matt Caswell matt at openssl.org
Wed Jul 31 16:31:57 UTC 2019


The branch master has been updated
       via  0c789f59f117ccbb30ffc621216ba776117c7c61 (commit)
      from  7408f6759f1b0100438ca236ea8f549454aaf2d5 (commit)


- Log -----------------------------------------------------------------
commit 0c789f59f117ccbb30ffc621216ba776117c7c61
Author: joe2018Outlookcom <joe_2018 at Outlook.com>
Date:   Wed Jul 31 13:46:02 2019 +0800

    Fix warning C4164 in MSVC.
    
    Fix: crypto\whrlpool\wp_block.c(90) : warning C4164: '_rotl64' : intrinsic function not declared.
    Fixes #9487
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9488)

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

Summary of changes:
 crypto/whrlpool/wp_block.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/whrlpool/wp_block.c b/crypto/whrlpool/wp_block.c
index 14327f16de..574ac124d4 100644
--- a/crypto/whrlpool/wp_block.c
+++ b/crypto/whrlpool/wp_block.c
@@ -87,6 +87,7 @@ typedef unsigned long long u64;
 #ifndef PEDANTIC
 # if defined(_MSC_VER)
 #  if defined(_WIN64)            /* applies to both IA-64 and AMD64 */
+#   include <stdlib.h>
 #   pragma intrinsic(_rotl64)
 #   define ROTATE(a,n) _rotl64((a),n)
 #  endif


More information about the openssl-commits mailing list