From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 2 Aug 2019 18:07:19 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.1.0~297
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aeac83616580a007aebc1e8f85209f47f416733;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 02ae8be92..de4242694 100644
--- a/open-vm-tools/lib/include/sha1.h
+++ b/open-vm-tools/lib/include/sha1.h
@@ -143,11 +143,11 @@ void SHA1MultiBuffer(uint32 numBuffers,
 #if !defined VMKBOOT && !defined VMKERNEL
 
 /* Opaque handle */
-typedef struct {
-#if defined __APPLE__
-   uint8 _private[96];  // sizeof CC_SHA1_CTX
-#else
+typedef union {
    void *_private;
+#if defined __APPLE__
+   uint8 _pad[104 + 8];  // sizeof CC_SHA256_CTX + extra field,
+                         // where SHA256 is largest CTX
 #endif
 } CryptoHash_SHA1_CTX;