Fixed build failed.

Signed-off-by: Eric Dong <eric.dong@intel.com>

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

4 files changed, 12 insertions, 12 deletions

diff --git a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
index b5b51b4ed2..84b8cf7884 100644
--- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
+++ b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
@@ -532,7 +532,7 @@ IsBootOption (
     // Try to find the DevicePath in BootOption

     //

     UnicodeSPrint (StrTemp, sizeof (StrTemp), L"Boot%04x", Index);

-    GetEfiGlobalVariable2 (StrTemp, &OptionBuffer, NULL);

+    GetEfiGlobalVariable2 (StrTemp, (VOID**)&OptionBuffer, NULL);

     if (OptionBuffer == NULL) {

       continue;

     }

diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index ec18a1b523..79d2261251 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
@@ -1065,7 +1065,7 @@ VerifyCertUefiGuid (
   //

   // Get KEK database variable.

   //

-  GetEfiGlobalVariable2 (EFI_KEY_EXCHANGE_KEY_NAME, &KekList, NULL);

+  GetEfiGlobalVariable2 (EFI_KEY_EXCHANGE_KEY_NAME, (VOID**)&KekList, NULL);

   if (KekList == NULL) {

     return EFI_SECURITY_VIOLATION;

   }

@@ -1260,7 +1260,7 @@ DxeImageVerificationHandler (
     return EFI_ACCESS_DENIED;

   }

 

-  GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, &SecureBootEnable, NULL);

+  GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, (VOID**)&SecureBootEnable, NULL);

   //

   // Skip verification if SecureBootEnable variable doesn't exist.

   //

@@ -1278,7 +1278,7 @@ DxeImageVerificationHandler (
 

   FreePool (SecureBootEnable);

 

-  GetEfiGlobalVariable2 (EFI_SETUP_MODE_NAME, &SetupMode, NULL);

+  GetEfiGlobalVariable2 (EFI_SETUP_MODE_NAME, (VOID**)&SetupMode, NULL);

 

   //

   // SetupMode doesn't exist means no AuthVar driver is dispatched,

@@ -1544,7 +1544,7 @@ VariableWriteCallBack (
   // If this library is built-in, it means firmware has capability to perform

   // driver signing verification.

   //

-  GetEfiGlobalVariable2 (EFI_SECURE_BOOT_MODE_NAME, &SecureBootModePtr, NULL);

+  GetEfiGlobalVariable2 (EFI_SECURE_BOOT_MODE_NAME, (VOID**)&SecureBootModePtr, NULL);

   if (SecureBootModePtr == NULL) {

     SecureBootMode   = SECURE_BOOT_MODE_DISABLE;

     //

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c
index 8585c72712..97bb077e2e 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c
@@ -410,7 +410,7 @@ DisplayLoadPermit(
     // Get driver device path.

     //

     UnicodeSPrint (VarName, sizeof (VarName), L"Driver%04x", Order[Index]);

-    GetEfiGlobalVariable2 (VarName, &Var, NULL);

+    GetEfiGlobalVariable2 (VarName, (VOID**)&Var, NULL);

     if (Var == NULL) {

       continue;

     }

@@ -655,7 +655,7 @@ AddToForbidLoad (
   // Get loadable driver device path.

   //

   UnicodeSPrint  (VarName, sizeof (VarName), L"Driver%04x", DriverIndex);

-  GetEfiGlobalVariable2 (VarName, &Var, NULL);

+  GetEfiGlobalVariable2 (VarName, (VOID**)&Var, NULL);

   if (Var == NULL) {

     return;

   }

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index 0dc9c2b22d..904a210338 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
@@ -2064,7 +2064,7 @@ SecureBootExtractConfigFromVariable (
   //

   // Get the SecureBootEnable Variable

   //

-  GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, &SecureBootEnable, NULL);

+  GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, (VOID**)&SecureBootEnable, NULL);

 

   //

   // If the SecureBootEnable Variable doesn't exist, hide the SecureBoot Enable/Disable

@@ -2088,7 +2088,7 @@ SecureBootExtractConfigFromVariable (
   //

   // If there is no PK then the Delete Pk button will be gray.

   //

-  GetVariable2 (EFI_SETUP_MODE_NAME, &gEfiGlobalVariableGuid, &SetupMode, NULL);

+  GetVariable2 (EFI_SETUP_MODE_NAME, &gEfiGlobalVariableGuid, (VOID**)&SetupMode, NULL);

   if (SetupMode == NULL || (*SetupMode) == 1) {

     ConfigData->HasPk = FALSE;

   } else  {

@@ -2098,7 +2098,7 @@ SecureBootExtractConfigFromVariable (
   //

   // Get the SecureBootMode from CustomMode variable.

   //

-  GetVariable2 (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid, &SecureBootMode, NULL);

+  GetVariable2 (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid, (VOID**)&SecureBootMode, NULL);

   if (SecureBootMode == NULL) {

     ConfigData->SecureBootMode = STANDARD_SECURE_BOOT_MODE;

   } else {

@@ -2329,7 +2329,7 @@ SecureBootCallback (
 

     switch (QuestionId) {

     case KEY_SECURE_BOOT_ENABLE:

-      GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, &SecureBootEnable, NULL);

+      GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, (VOID**)&SecureBootEnable, NULL);

       if (NULL != SecureBootEnable) {

         if (EFI_ERROR (SaveSecureBootVariable (Value->u8))) {

           CreatePopUp (

@@ -2517,7 +2517,7 @@ SecureBootCallback (
       break;

       

     case KEY_SECURE_BOOT_MODE:

-      GetVariable2 (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid, &SecureBootEnable, NULL);

+      GetVariable2 (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid, (VOID**)&SecureBootEnable, NULL);

       if (NULL != SecureBootEnable) {

         Status = gRT->SetVariable (                          

                         EFI_CUSTOM_MODE_NAME,