Add the missing EFI_IMAGE_EXECUTION_AUTH_ value definitions.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9521 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 14 insertions, 4 deletions

diff --git a/MdePkg/Include/Guid/ImageAuthentication.h b/MdePkg/Include/Guid/ImageAuthentication.h
index 5e97c3c848..0d28d4d04c 100644
--- a/MdePkg/Include/Guid/ImageAuthentication.h
+++ b/MdePkg/Include/Guid/ImageAuthentication.h
@@ -166,7 +166,14 @@ typedef struct {
 //***********************************************************************

 typedef UINT32 EFI_IMAGE_EXECUTION_ACTION;

 

-#define EFI_IMAGE_EXECUTION_AUTHENTICATION          0x00000007 

+#define EFI_IMAGE_EXECUTION_AUTHENTICATION      0x00000007 

+#define EFI_IMAGE_EXECUTION_AUTH_UNTESTED       0x00000000

+#define EFI_IMAGE_EXECUTION_AUTH_SIG_FAILED     0x00000001

+#define EFI_IMAGE_EXECUTION_AUTH_SIG_PASSED     0x00000002

+#define EFI_IMAGE_EXECUTION_AUTH_SIG_NOT_FOUND  0x00000003

+#define EFI_IMAGE_EXECUTION_AUTH_SIG_FOUND      0x00000004

+#define EFI_IMAGE_EXECUTION_POLICY_FAILED       0x00000005

+#define EFI_IMAGE_EXECUTION_INITIALIZED         0x00000008

 

 //

 // EFI_IMAGE_EXECUTION_INFO is added to EFI System Configuration Table 

diff --git a/MdePkg/Include/Guid/WinCertificate.h b/MdePkg/Include/Guid/WinCertificate.h
index f7a4190c2e..309046e331 100644
--- a/MdePkg/Include/Guid/WinCertificate.h
+++ b/MdePkg/Include/Guid/WinCertificate.h
@@ -62,9 +62,12 @@ typedef struct {
 /// WIN_CERTIFICATE_UEFI_GUID.CertData

 /// 

 typedef struct {

-  UINT32  HashType;

-  UINT8   PublicKey[256];

-  UINT8   Signature[256];

+  //

+  // HashType not in public UEFI specification.

+  //

+  EFI_GUID  HashType;

+  UINT8     PublicKey[256];

+  UINT8     Signature[256];

 } EFI_CERT_BLOCK_RSA_2048_SHA256;