BaseTools: Clear build versions to sync with buildtools/BaseTools

[mirror_edk2.git] / BaseTools / Source / C / Include / Common / UefiMultiPhase.h

diff --git a/BaseTools/Source/C/Include/Common/UefiMultiPhase.h b/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
index 11c587e862642c26e9c2a9a73a8f7950b54096d5..7c487471a8a277447d4fb300baa8c314f1dd2a89 100644 (file)
--- a/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
+++ b/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file\r
   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r
 \r
 /** @file\r
   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r
 \r

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials are licensed and made available\r
   under the terms and conditions of the BSD License which accompanies this\r
 \r
   This program and the accompanying materials are licensed and made available\r
   under the terms and conditions of the BSD License which accompanies this\r


@@ -117,9 +117,9 @@ typedef struct _WIN_CERTIFICATE {
 // WIN_CERTIFICATE_UEFI_GUID.CertData\r
 // \r
 typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {\r
 // WIN_CERTIFICATE_UEFI_GUID.CertData\r
 // \r
 typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {\r

-  UINT32  HashType;\r
-  UINT8   PublicKey[256];\r
-  UINT8   Signature[256];\r
+  EFI_GUID  HashType;\r
+  UINT8     PublicKey[256];\r
+  UINT8     Signature[256];\r

 } EFI_CERT_BLOCK_RSA_2048_SHA256;\r
 \r
 \r
 } EFI_CERT_BLOCK_RSA_2048_SHA256;\r
 \r
 \r


@@ -127,7 +127,7 @@ typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {
    \r
   @param Hdr  This is the standard WIN_CERTIFICATE header, where\r
               wCertificateType is set to\r
    \r
   @param Hdr  This is the standard WIN_CERTIFICATE header, where\r
               wCertificateType is set to\r

-              WIN_CERT_TYPE_UEFI_GUID.\r
+              WIN_CERT_TYPE_EFI_GUID.\r

 \r
   @param CertType   This is the unique id which determines the\r
                     format of the CertData. In this case, the\r
 \r
   @param CertType   This is the unique id which determines the\r
                     format of the CertData. In this case, the\r