From a1e98f78bec6f64c514ebf94bef68a8a5b87e3b4 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Fri, 26 Feb 2010 09:27:59 +0000 Subject: According to the latest UEFI 2.3 errata B, the following changes are made: 1.EFI_IMAGE_EXECUTION_INFO structure.Signature field. 2.HiiConfigAccess.ExtractConfig function comments 3.HiiConfigRouting.ExtractConfig, BlockToConfig and GetAltConfig function comments. 4.Remove not in public UEFI spec comments. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10113 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Include/Guid/ImageAuthentication.h | 21 ++++++++++++++------- MdePkg/Include/Guid/WinCertificate.h | 5 +---- 2 files changed, 15 insertions(+), 11 deletions(-) (limited to 'MdePkg/Include/Guid') diff --git a/MdePkg/Include/Guid/ImageAuthentication.h b/MdePkg/Include/Guid/ImageAuthentication.h index 0d28d4d04c..92b239a01f 100644 --- a/MdePkg/Include/Guid/ImageAuthentication.h +++ b/MdePkg/Include/Guid/ImageAuthentication.h @@ -2,7 +2,7 @@ Platform Key, Key Exchange Key, and Image signature database are defined for the signed image validation. - Copyright (c) 2009, Intel Corporation + Copyright (c) 2009 - 2010, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -205,18 +205,25 @@ typedef struct { /// EFI_DEVICE_PATH_PROTOCOL DevicePath; /// - /// - /// The image digest of the image. The certificate type must be one of the hash types. - /// The hash type must match the type used in the Signature field. - /// - WIN_CERTIFICATE ImageHash; /// /// Zero or more image signatures. If the image contained no signatures, /// then this field is empty. /// - WIN_CERTIFICATE Signature; + EFI_SIGNATURE_LIST Signature; } EFI_IMAGE_EXECUTION_INFO; + +typedef struct { + /// + /// Number of EFI_IMAGE_EXECUTION_INFO structures. + /// + UINTN NumberOfImages; + /// + /// Number of image instances of EFI_IMAGE_EXECUTION_INFO structures. + /// + // EFI_IMAGE_EXECUTION_INFO InformationInfo[] +} EFI_IMAGE_EXECUTION_INFO_TABLE; + extern EFI_GUID gEfiImageSecurityDatabaseGuid; extern EFI_GUID gEfiCertSha256Guid; extern EFI_GUID gEfiCertRsa2048Guid; diff --git a/MdePkg/Include/Guid/WinCertificate.h b/MdePkg/Include/Guid/WinCertificate.h index 309046e331..b81add2b3d 100644 --- a/MdePkg/Include/Guid/WinCertificate.h +++ b/MdePkg/Include/Guid/WinCertificate.h @@ -1,7 +1,7 @@ /** @file GUID for UEFI WIN_CERTIFICATE structure. - Copyright (c) 2006 - 2009, Intel Corporation + Copyright (c) 2006 - 2010, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -62,9 +62,6 @@ typedef struct { /// WIN_CERTIFICATE_UEFI_GUID.CertData /// typedef struct { - // - // HashType not in public UEFI specification. - // EFI_GUID HashType; UINT8 PublicKey[256]; UINT8 Signature[256]; -- cgit v1.2.3