From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 2 Aug 2019 18:07:20 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.1.0~290
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f83425b3daa3dd985bb8c7fe3af24c034f5feb94;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/sha1.h b/open-vm-tools/lib/include/sha1.h
index e57bd2ac7..2851fb8e0 100644
--- a/open-vm-tools/lib/include/sha1.h
+++ b/open-vm-tools/lib/include/sha1.h
@@ -144,12 +144,13 @@ void SHA1MultiBuffer(uint32 numBuffers,
 
 /* Opaque handle */
 typedef union {
-   void *_private;
 #if defined __APPLE__
-   uint8 _pad[104 + 8];  // sizeof CC_SHA256_CTX + extra field,
-                         // where SHA256 is largest CTX
+   uint8 _private[104 + 8];  // sizeof CC_SHA256_CTX + extra field,
+                             // where SHA256 is largest CTX
 #elif defined _WIN32
-   uint8 _pad[384];      // see CryptoHashInitCommon
+   uint8 _private[384];      // see CryptoHashInitCommon
+#else
+   uintptr_t _private;
 #endif
 } CryptoHash_SHA1_CTX;