From: Oliver Kurth <okurth@vmware.com>
Date: Sun, 21 Jul 2019 00:15:20 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.1.0~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec0c3ec2aa40e6c0f5dc8cc445c8eddfcdb18c8f;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 e73074d36..02ae8be92 100644
--- a/open-vm-tools/lib/include/sha1.h
+++ b/open-vm-tools/lib/include/sha1.h
@@ -142,21 +142,18 @@ void SHA1MultiBuffer(uint32 numBuffers,
 
 #if !defined VMKBOOT && !defined VMKERNEL
 
-/* OpenSSL opaque type for hashing. Opaque as of openssl-1.1.0. */
-struct evp_md_ctx_st;
-
+/* Opaque handle */
 typedef struct {
-#ifdef __APPLE__
-   CC_SHA1_CTX cc_ctx;
+#if defined __APPLE__
+   uint8 _private[96];  // sizeof CC_SHA1_CTX
 #else
-   struct evp_md_ctx_st *md;  /* OpenSSL EVP_MD_CTX */
+   void *_private;
 #endif
 } CryptoHash_SHA1_CTX;
 
 void CryptoHash_InitSHA1(CryptoHash_SHA1_CTX *ctx);
 void CryptoHash_UpdateSHA1(CryptoHash_SHA1_CTX *ctx,
-                           const void *data,
-                           size_t len);
+                           const void *data, size_t len);
 void CryptoHash_FinalSHA1(CryptoHash_SHA1_CTX *ctx,
                           unsigned char digest[SHA1_HASH_LEN]);
 void CryptoHash_ComputeSHA1(const void *data, size_t len,