Move the declaration of gEfiCertDbGuid to the package's Include folder.

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting  <ting.ye@intel.com>
Reviewed-by: Dong Guo <guo.dong@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13975 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h b/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
index 46420406a7ae97c83d82cd5314e96098c9966f64..6ffd9f17e389d68c8556e504c02ff52b5c0665dc 100644 (file)
--- a/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
+++ b/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
@@ -27,6 +27,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 extern EFI_GUID gEfiAuthenticatedVariableGuid;\r
 extern EFI_GUID gEfiSecureBootEnableDisableGuid;\r
 \r
 extern EFI_GUID gEfiAuthenticatedVariableGuid;\r
 extern EFI_GUID gEfiSecureBootEnableDisableGuid;\r

+extern EFI_GUID gEfiCertDbGuid;\r
+extern EFI_GUID gEfiCustomModeEnableGuid;\r

 \r
 ///\r
 /// "SecureBootEnable" variable for the Secure Boot feature enable/disable.\r
 \r
 ///\r
 /// "SecureBootEnable" variable for the Secure Boot feature enable/disable.\r


@@ -37,8 +39,6 @@ extern EFI_GUID gEfiSecureBootEnableDisableGuid;
 #define SECURE_BOOT_ENABLE               1\r
 #define SECURE_BOOT_DISABLE              0\r
 \r
 #define SECURE_BOOT_ENABLE               1\r
 #define SECURE_BOOT_DISABLE              0\r
 \r

-extern EFI_GUID gEfiCustomModeEnableGuid;\r
-\r

 ///\r
 ///  "CustomMode" variable for two Secure Boot modes feature: "Custom" and "Standard".\r
 ///  Standard Secure Boot mode is the default mode as UEFI Spec's description.\r
 ///\r
 ///  "CustomMode" variable for two Secure Boot modes feature: "Custom" and "Standard".\r
 ///  Standard Secure Boot mode is the default mode as UEFI Spec's description.\r

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.h b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.h
index 1f62383aed622e4456ae52d419b84289d4b83c13..510030d705120ccce51af1ea5146616d2aa1150c 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.h
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.h
@@ -51,8 +51,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EFI_CERT_DB_NAME        L"certdb"\r
 #define MAX_CERTDB_SIZE (FixedPcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER) - sizeof (EFI_CERT_DB_NAME))\r
 \r
 #define EFI_CERT_DB_NAME        L"certdb"\r
 #define MAX_CERTDB_SIZE (FixedPcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER) - sizeof (EFI_CERT_DB_NAME))\r
 \r

-extern  EFI_GUID gEfiCertDbGuid;\r
-\r

 ///\r
 /// Struct to record signature requirement defined by UEFI spec.\r
 /// For SigHeaderSize and SigDataSize, ((UINT32) ~0) means NO exact length requirement for this field.\r
 ///\r
 /// Struct to record signature requirement defined by UEFI spec.\r
 /// For SigHeaderSize and SigDataSize, ((UINT32) ~0) means NO exact length requirement for this field.\r