Vlv2TbltDevicePkg: Use the merged Variable driver

[mirror_edk2.git] / SecurityPkg / VariableAuthenticated / RuntimeDxe / VarCheck.c

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VarCheck.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VarCheck.c
index 3f4beb07f0e03a153d5a7af4dc5fa1cc4f15f0c0..740632f2888bb0345a7bf64eb7c40bb03694f9b4 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VarCheck.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VarCheck.c
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 #include "Variable.h"\r
+#include "AuthService.h"\r
 #include <Library/DevicePathLib.h>\r
 \r
 extern LIST_ENTRY mLockedVariableList;\r
@@ -403,6 +404,17 @@ UEFI_DEFINED_VARIABLE_ENTRY mGlobalVariableList[] = {
     },\r
     InternalVarCheckSizeArray\r
   },\r
+  {\r
+    EFI_SYS_PREP_ORDER_VARIABLE_NAME,\r
+    {\r
+      VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r
+      0,\r
+      VARIABLE_ATTRIBUTE_NV_BS_RT,\r
+      sizeof (UINT16),\r
+      MAX_UINTN\r
+    },\r
+    InternalVarCheckSizeArray\r
+  },\r
   {\r
     EFI_HW_ERR_REC_SUPPORT_VARIABLE_NAME,\r
     {\r
@@ -581,6 +593,17 @@ UEFI_DEFINED_VARIABLE_ENTRY mGlobalVariableList2[] = {
     },\r
     InternalVarCheckLoadOption\r
   },\r
+  {\r
+    L"SysPrep####",\r
+    {\r
+      VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r
+      0,\r
+      VARIABLE_ATTRIBUTE_NV_BS_RT,\r
+      sizeof (UINT32) + sizeof (UINT16),\r
+      MAX_UINTN\r
+    },\r
+    InternalVarCheckLoadOption\r
+  },\r
   {\r
     L"Key####",\r
     {\r
@@ -668,7 +691,7 @@ VARIABLE_DRIVER_VARIABLE_ENTRY mVariableDriverVariableList[] = {
     EFI_VENDOR_KEYS_NV_VARIABLE_NAME,\r
     {\r
       VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r
-      0,\r
+      VAR_CHECK_VARIABLE_PROPERTY_READ_ONLY,\r
       VARIABLE_ATTRIBUTE_NV_BS_RT_AT,\r
       sizeof (UINT8),\r
       sizeof (UINT8)\r
@@ -676,10 +699,10 @@ VARIABLE_DRIVER_VARIABLE_ENTRY mVariableDriverVariableList[] = {
   },\r
   {\r
     &gEfiAuthenticatedVariableGuid,\r
-    L"AuthVarKeyDatabase",\r
+    AUTHVAR_KEYDB_NAME,\r
     {\r
       VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r
-      0,\r
+      VAR_CHECK_VARIABLE_PROPERTY_READ_ONLY,\r
       VARIABLE_ATTRIBUTE_NV_BS_RT_AW,\r
       sizeof (UINT8),\r
       MAX_UINTN\r
@@ -687,10 +710,10 @@ VARIABLE_DRIVER_VARIABLE_ENTRY mVariableDriverVariableList[] = {
   },\r
   {\r
     &gEfiCertDbGuid,\r
-    L"certdb",\r
+    EFI_CERT_DB_NAME,\r
     {\r
       VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r
-      0,\r
+      VAR_CHECK_VARIABLE_PROPERTY_READ_ONLY,\r
       VARIABLE_ATTRIBUTE_NV_BS_RT_AT,\r
       sizeof (UINT32),\r
       MAX_UINTN\r