BaseTools: Fix wrong variable header size

There are two type variable header and their size are different,
need to use matched size when calculating offset info, otherwise
it'll destroy other variables content when patching.

Signed-off-by: Chen, Lin Z <lin.z.chen@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/Python/AutoGen/GenVar.py
index 3f3dc69e90b273a4e959d82b68485be9ba310788..f2ad54ba630ecc6dace8e6b08e34796ce19d9325 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenVar.py
+++ b/BaseTools/Source/Python/AutoGen/GenVar.py
@@ -20,6 +20,7 @@ import Common.GlobalData as GlobalData
 var_info = collections.namedtuple("uefi_var", "pcdindex,pcdname,defaultstoragename,skuname,var_name, var_guid, var_offset,var_attribute,pcd_default_value, default_value, data_type,PcdDscLine,StructurePcd")\r
 NvStorageHeaderSize = 28\r
 VariableHeaderSize = 32\r
+AuthenticatedVariableHeaderSize = 60\r
 \r
 class VariableMgr(object):\r
     def __init__(self, DefaultStoreMap, SkuIdMap):\r
@@ -171,7 +172,10 @@ class VariableMgr(object):
             DataBuffer = VariableMgr.AlignData(var_name_buffer + default_data)\r
 \r
             data_size = len(DataBuffer)\r
-            offset += VariableHeaderSize + len(default_info.var_name.split(","))\r
+            if GlobalData.gCommandLineDefines.get(TAB_DSC_DEFINES_VPD_AUTHENTICATED_VARIABLE_STORE,"FALSE").upper() == "TRUE":\r
+                offset += AuthenticatedVariableHeaderSize + len(default_info.var_name.split(","))\r
+            else:\r
+                offset += VariableHeaderSize + len(default_info.var_name.split(","))\r
             var_data_offset[default_info.pcdindex] = offset\r
             offset += data_size - len(default_info.var_name.split(","))\r
             if GlobalData.gCommandLineDefines.get(TAB_DSC_DEFINES_VPD_AUTHENTICATED_VARIABLE_STORE,"FALSE").upper() == "TRUE":\r