Changeset 89983 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/SecurityPkg/Hash2DxeCrypto

Timestamp:

Jul 1, 2021 8:17:41 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145450

Message:

Devices/EFI: Merge edk-stable202105 and openssl 1.1.1j and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c (modified) (1 diff)
• SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c

@@ -121 +121 @@
 
 EFI_HASH_INFO  mHashInfo[] = {
-  {&gEfiHashAlgorithmMD5Guid,     sizeof(EFI_MD5_HASH2),    Md5GetContextSize,    Md5Init,    Md5Update,    Md5Final  },
-  {&gEfiHashAlgorithmSha1Guid,    sizeof(EFI_SHA1_HASH2),   Sha1GetContextSize,   Sha1Init,   Sha1Update,   Sha1Final   },
   {&gEfiHashAlgorithmSha256Guid,  sizeof(EFI_SHA256_HASH2), Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final },
   {&gEfiHashAlgorithmSha384Guid,  sizeof(EFI_SHA384_HASH2), Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final },

trunk/src/VBox/Devices/EFI/FirmwareNew/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf

@@ -5 +5 @@
 #
 #  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-#  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.<BR>
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -45 +45 @@
 
 [Guids]
-  gEfiHashAlgorithmMD5Guid              ## CONSUMES               ## GUID
-  gEfiHashAlgorithmSha1Guid             ## CONSUMES               ## GUID
   gEfiHashAlgorithmSha256Guid           ## CONSUMES               ## GUID
   gEfiHashAlgorithmSha384Guid           ## CONSUMES               ## GUID