[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  0969e2592e634670f1953ac37357e93fc479aa69 (commit)
      from  1352e0ff490d758cfd74e179e8a9614833fd88a9 (commit)


- Log -----------------------------------------------------------------
commit 0969e2592e634670f1953ac37357e93fc479aa69
Author: avas <avas at devvm3802.prn2.facebook.com>
Date:   Thu Dec 5 06:14:44 2019 -0800

    Move U64 macro from sha.h to sha512.c
    
    Summary:
    U64 is too common name for macro, being in public header sha.h it
    conflicts with other projects (WAVM in my case). Moving macro from
    public header to the only .c file using it.
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10579)

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

Summary of changes:
 crypto/sha/sha512.c   | 8 ++++++++
 include/openssl/sha.h | 3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index 03189a9d9c..c70edf572a 100644
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -60,6 +60,14 @@
 # define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
 #endif
 
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+# define U64(C)     C##UI64
+#elif defined(__arch64__)
+# define U64(C)     C##UL
+#else
+# define U64(C)     C##ULL
+#endif
+
 int sha512_224_init(SHA512_CTX *c)
 {
     c->h[0] = U64(0x8c3d37c819544da2);
diff --git a/include/openssl/sha.h b/include/openssl/sha.h
index e262ea3700..be27e2c972 100644
--- a/include/openssl/sha.h
+++ b/include/openssl/sha.h
@@ -89,13 +89,10 @@ void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
 # define SHA512_CBLOCK   (SHA_LBLOCK*8)
 # if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
 #  define SHA_LONG64 unsigned __int64
-#  define U64(C)     C##UI64
 # elif defined(__arch64__)
 #  define SHA_LONG64 unsigned long
-#  define U64(C)     C##UL
 # else
 #  define SHA_LONG64 unsigned long long
-#  define U64(C)     C##ULL
 # endif
 
 typedef struct SHA512state_st {