4 files changed, 7 insertions, 7 deletions
diff --git a/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockPlatformPKProtectionLib.inf b/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockPlatformPKProtectionLib.inf
index 1e19033c5a..c927ef7099 100644
--- a/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockPlatformPKProtectionLib.inf
+++ b/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockPlatformPKProtectionLib.inf
@@ -10,9 +10,9 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = MockPlatformPKProtectionLib
   FILE_GUID                      = 5FCD74D3-3965-4D56-AB83-000B9B4806A0
-  MODULE_TYPE                    = DXE_DRIVER
+  MODULE_TYPE                    = HOST_APPLICATION
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = PlatformPKProtectionLib|HOST_APPLICATION
+  LIBRARY_CLASS                  = PlatformPKProtectionLib
 
 #
 # The following information is for reference only and not required by the build tools.
diff --git a/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiLib.inf b/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiLib.inf
index a84242ac72..fecf468411 100644
--- a/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiLib.inf
+++ b/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiLib.inf
@@ -18,9 +18,9 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = MockUefiLib
   FILE_GUID                      = E3B7AEF9-4E55-49AF-B035-ED776C928EC6
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = HOST_APPLICATION
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = UefiLib|HOST_APPLICATION
+  LIBRARY_CLASS                  = UefiLib
 
 #
 #  VALID_ARCHITECTURES           = IA32 X64 EBC
diff --git a/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiRuntimeServicesTableLib.inf b/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiRuntimeServicesTableLib.inf
index f832a93e22..6fe0418960 100644
--- a/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiRuntimeServicesTableLib.inf
+++ b/SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiRuntimeServicesTableLib.inf
@@ -10,9 +10,9 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = MockUefiRuntimeServicesTableLib
   FILE_GUID                      = 84CE0021-ABEE-403C-9A1B-763CCF2D40F1
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = HOST_APPLICATION
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = UefiRuntimeServicesTableLib|HOST_APPLICATION
+  LIBRARY_CLASS                  = UefiRuntimeServicesTableLib
 
 #
 #  VALID_ARCHITECTURES           = IA32 X64 EBC
diff --git a/SecurityPkg/Library/SecureBootVariableLib/UnitTest/SecureBootVariableLibUnitTest.c b/SecurityPkg/Library/SecureBootVariableLib/UnitTest/SecureBootVariableLibUnitTest.c
index a23135dfb0..3a92d5d834 100644
--- a/SecurityPkg/Library/SecureBootVariableLib/UnitTest/SecureBootVariableLibUnitTest.c
+++ b/SecurityPkg/Library/SecureBootVariableLib/UnitTest/SecureBootVariableLibUnitTest.c
@@ -163,7 +163,7 @@ MockGetVariable (
     return EFI_BUFFER_TOO_SMALL;
   } else {
     assert_non_null (Data);
-    CopyMem (Data, (VOID *)mock (), TargetSize);
+    CopyMem (Data, (VOID *)(UINTN)mock (), TargetSize);
   }
 
   return EFI_SUCCESS;