From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 12 Oct 2022 19:40:37 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.2.0~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70a10365ba86e871710551d54e565ba6b8b3f4eb;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 335e508c3..e7fd4f7a4 100644
--- a/open-vm-tools/lib/include/sha1.h
+++ b/open-vm-tools/lib/include/sha1.h
@@ -41,7 +41,6 @@
 
 #define INCLUDE_ALLOW_MODULE
 #define INCLUDE_ALLOW_USERLEVEL
-#define INCLUDE_ALLOW_VMKERNEL
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 
@@ -70,8 +69,6 @@ extern "C" {
 
 #else
 
-#ifndef VMKERNEL
-
 /*
  * Prevent linkage conflicts with the SHA1 APIs brought in from
  * OpenSSL. (Pro tip: If you're doing anything security-related, you
@@ -83,8 +80,6 @@ extern "C" {
 #define SHA1Update           VMW_SHA1Update
 #define SHA1Final            VMW_SHA1Final
 
-#endif /* !VMKERNEL */
-
 /*
 SHA-1 in C
 By Steve Reid <steve@edmweb.com>
@@ -112,25 +107,14 @@ typedef struct SHA1_CTX {
     unsigned char buffer[64];
 } SHA1_CTX;
 
-#if defined VMKBOOT || defined VMKERNEL
-/* New SHA1 uses are not allowed. Old uses are going away. SHA1 isn't secure. */
-void SHA1Init_Legacy(SHA1_CTX* context);
-void SHA1Update_Legacy(SHA1_CTX* context,
-                       const unsigned char *data,
-                       size_t len);
-void SHA1Final_Legacy(unsigned char digest[SHA1_HASH_LEN], SHA1_CTX* context);
-#else
 void SHA1Init(SHA1_CTX* context);
 void SHA1Update(SHA1_CTX* context,
                 const unsigned char *data,
                 size_t len);
 void SHA1Final(unsigned char digest[SHA1_HASH_LEN], SHA1_CTX* context);
-#endif
 
 #endif // defined __APPLE__ && defined USERLEVEL
 
-#if !defined VMKBOOT && !defined VMKERNEL
-
 /* Opaque handle */
 typedef union {
 #if defined __APPLE__
@@ -150,7 +134,6 @@ void CryptoHash_FinalSHA1(CryptoHash_SHA1_CTX *ctx,
                           unsigned char digest[SHA1_HASH_LEN]);
 void CryptoHash_ComputeSHA1(const void *data, size_t len,
                             unsigned char digest[SHA1_HASH_LEN]);
-#endif
 
 #if defined(__cplusplus)
 }  // extern "C"