From nobody Mon Apr 29 04:49:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+86014+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+86014+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1643010527; cv=none; d=zohomail.com; s=zohoarc; b=Aw3omiK3cajMyrUevsYT2QkBx7cPJidQyojF0ClxpAQGGUMq+hYLOfZ7BjqVv2EYIXW4Y/SGfnjQSk7fu5LtMv6a/K5pvLkAWVqM/AToGsHWGHTZxqe/R+h+lDJhSxjTdc9PFexeCKNze2JujghyjRtqCsVwKElAH7mPVtT+MSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643010527; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=xbxqArPWPOXqRcEPsxJgdl6b/imED8xSk20n0zO0EKQ=; b=DQkKefpfHipB8kZnpdQl1UqWEM8LEecZLBv18zdMxv0QZozjLLZ6TyZtpI6C4X95ktci7OYVrVy00yE/7o5hpmjtXO7szqqXhk/OU7HK+ay2uqAtICgWQi05IBC1M32W6BI0j9v26xiizVEervwCp/OHmrStXvunznJzCmxUquQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+86014+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643010527913855.4866550463848; Sun, 23 Jan 2022 23:48:47 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id fe1IYY1788612x02vMeDzNZi; Sun, 23 Jan 2022 23:48:47 -0800 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web08.875.1643010525202979937 for ; Sun, 23 Jan 2022 23:48:46 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10236"; a="243584405" X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="243584405" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2022 23:48:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="627399023" X-Received: from shbiosbuild1001.sh.intel.com ([10.239.132.191]) by orsmga004.jf.intel.com with ESMTP; 23 Jan 2022 23:48:40 -0800 From: "Chen Lin Z" To: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, devel@edk2.groups.io Cc: di.zhang@intel.com, Chen Lin Z Subject: [edk2-devel] [PATCH] Revert two commits for authenticated variable store support in VPD Date: Mon, 24 Jan 2022 15:54:18 +0000 Message-Id: <4bbe335983823c5cf9c4e9f43eb96913e45a3fcf.1643039524.git.lin.z.chen@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lin.z.chen@intel.com X-Gm-Message-State: fIrebrF2HAQ1TrTgplBT55Kjx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643010527; bh=nV7wN0lDq6X7idR1wiQKvMeEcmxfyQMlUJvQg3Ln/R0=; h=Cc:Date:From:Reply-To:Subject:To; b=duPB72Ja8vg3k2yJ64kd0XTrbACjUFWgMh1HTcxLp0jU9HuCHec4Gfrmjmv0fuyry4i XGVFIcqt3KiCf0o3AbCHL5K12AIQWuQgFGBf1lRv9LOmgLDnnyXielmKKOBk5N0uSutUM heOCVkmFeim/VftCjXB98l2+phSmZWR3zFg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643010529206100001 Content-Type: text/plain; charset="utf-8" Variable driver will responsible to convert normal variable format to the authenticated variable format, so no need to add support in BaseTools. 1.Revert "BaseTools: Add authenticated variable store support" This reverts commit 22c3b5a865ec800b7eecf43de336ad5e2d917a08. 2. Revert "BaseTools: Fix wrong variable header size" This reverts commit 7438a85bf1388add286a89707079d9afca735814. --- BaseTools/Source/Python/AutoGen/GenVar.py | 63 ++----------------- BaseTools/Source/Python/Common/DataType.py | 1 - .../Source/Python/Workspace/DscBuildData.py | 4 -- 3 files changed, 4 insertions(+), 64 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/P= ython/AutoGen/GenVar.py index f2ad54ba63..591ef3df55 100644 --- a/BaseTools/Source/Python/AutoGen/GenVar.py +++ b/BaseTools/Source/Python/AutoGen/GenVar.py @@ -15,12 +15,10 @@ from Common.VariableAttributes import VariableAttributes from Common.Misc import * import collections import Common.DataType as DataType -import Common.GlobalData as GlobalData =20 var_info =3D collections.namedtuple("uefi_var", "pcdindex,pcdname,defaults= toragename,skuname,var_name, var_guid, var_offset,var_attribute,pcd_default= _value, default_value, data_type,PcdDscLine,StructurePcd") NvStorageHeaderSize =3D 28 VariableHeaderSize =3D 32 -AuthenticatedVariableHeaderSize =3D 60 =20 class VariableMgr(object): def __init__(self, DefaultStoreMap, SkuIdMap): @@ -172,22 +170,14 @@ class VariableMgr(object): DataBuffer =3D VariableMgr.AlignData(var_name_buffer + default= _data) =20 data_size =3D len(DataBuffer) - if GlobalData.gCommandLineDefines.get(TAB_DSC_DEFINES_VPD_AUTH= ENTICATED_VARIABLE_STORE,"FALSE").upper() =3D=3D "TRUE": - offset +=3D AuthenticatedVariableHeaderSize + len(default_= info.var_name.split(",")) - else: - offset +=3D VariableHeaderSize + len(default_info.var_name= .split(",")) + offset +=3D VariableHeaderSize + len(default_info.var_name.spl= it(",")) var_data_offset[default_info.pcdindex] =3D offset offset +=3D data_size - len(default_info.var_name.split(",")) - if GlobalData.gCommandLineDefines.get(TAB_DSC_DEFINES_VPD_AUTH= ENTICATED_VARIABLE_STORE,"FALSE").upper() =3D=3D "TRUE": - var_header_buffer =3D VariableMgr.PACK_AUTHENTICATED_VARIA= BLE_HEADER(var_attr_value, len(default_info.var_name.split(",")), len (defa= ult_data), vendorguid) - else: - var_header_buffer =3D VariableMgr.PACK_VARIABLE_HEADER(var= _attr_value, len(default_info.var_name.split(",")), len (default_data), ven= dorguid) + + var_header_buffer =3D VariableMgr.PACK_VARIABLE_HEADER(var_att= r_value, len(default_info.var_name.split(",")), len (default_data), vendorg= uid) NvStoreDataBuffer +=3D (var_header_buffer + DataBuffer) =20 - if GlobalData.gCommandLineDefines.get(TAB_DSC_DEFINES_VPD_AUTHENTI= CATED_VARIABLE_STORE,"FALSE").upper() =3D=3D "TRUE": - variable_storage_header_buffer =3D VariableMgr.PACK_AUTHENTICA= TED_VARIABLE_STORE_HEADER(len(NvStoreDataBuffer) + 28) - else: - variable_storage_header_buffer =3D VariableMgr.PACK_VARIABLE_S= TORE_HEADER(len(NvStoreDataBuffer) + 28) + variable_storage_header_buffer =3D VariableMgr.PACK_VARIABLE_STORE= _HEADER(len(NvStoreDataBuffer) + 28) =20 nv_default_part =3D VariableMgr.AlignData(VariableMgr.PACK_DEFAULT= _DATA(0, 0, VariableMgr.unpack_data(variable_storage_header_buffer+NvStoreD= ataBuffer)), 8) =20 @@ -262,20 +252,6 @@ class VariableMgr(object): =20 return GuidBuffer + SizeBuffer + FormatBuffer + StateBuffer + rese= rvedBuffer =20 - def PACK_AUTHENTICATED_VARIABLE_STORE_HEADER(size): - #Signature: gEfiAuthenticatedVariableGuid - Guid =3D "{ 0xaaf32c78, 0x947b, 0x439a, { 0xa1, 0x80, 0x2e, 0x14, = 0x4e, 0xc3, 0x77, 0x92 }}" - Guid =3D GuidStructureStringToGuidString(Guid) - GuidBuffer =3D PackGUID(Guid.split('-')) - - SizeBuffer =3D pack('=3DL', size) - FormatBuffer =3D pack('=3DB', 0x5A) - StateBuffer =3D pack('=3DB', 0xFE) - reservedBuffer =3D pack('=3DH', 0) - reservedBuffer +=3D pack('=3DL', 0) - - return GuidBuffer + SizeBuffer + FormatBuffer + StateBuffer + rese= rvedBuffer - @staticmethod def PACK_NV_STORE_DEFAULT_HEADER(size, maxsize): Signature =3D pack('=3DB', ord('N')) @@ -303,37 +279,6 @@ class VariableMgr(object): =20 return Buffer =20 - @staticmethod - def PACK_AUTHENTICATED_VARIABLE_HEADER(attribute, namesize, datasize, = vendorguid): - - Buffer =3D pack('=3DH', 0x55AA) # pack StartID - Buffer +=3D pack('=3DB', 0x3F) # pack State - Buffer +=3D pack('=3DB', 0) # pack reserved - - Buffer +=3D pack('=3DL', attribute) - - Buffer +=3D pack('=3DQ', 0) # pack MonotonicCount - Buffer +=3D pack('=3DHBBBBBBLhBB', # pack TimeStamp - 0, # UINT16 Year - 0, # UINT8 Month - 0, # UINT8 Day - 0, # UINT8 Hour - 0, # UINT8 Minute - 0, # UINT8 Second - 0, # UINT8 Pad1 - 0, # UINT32 Nanosecond - 0, # INT16 TimeZone - 0, # UINT8 Daylight - 0) # UINT8 Pad2 - Buffer +=3D pack('=3DL', 0) # pack PubKeyIndex - - Buffer +=3D pack('=3DL', namesize) - Buffer +=3D pack('=3DL', datasize) - - Buffer +=3D PackGUID(vendorguid) - - return Buffer - @staticmethod def PACK_VARIABLES_DATA(var_value,data_type, tail =3D None): Buffer =3D bytearray() diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/= Python/Common/DataType.py index dc49623333..4e9c9e34af 100644 --- a/BaseTools/Source/Python/Common/DataType.py +++ b/BaseTools/Source/Python/Common/DataType.py @@ -406,7 +406,6 @@ TAB_DSC_DEFINES_SKUID_IDENTIFIER =3D 'SKUID_IDENTIFIER' TAB_DSC_DEFINES_PCD_INFO_GENERATION =3D 'PCD_INFO_GENERATION' TAB_DSC_DEFINES_PCD_DYNAMIC_AS_DYNAMICEX =3D 'PCD_DYNAMIC_AS_DYNAMICEX' TAB_DSC_DEFINES_PCD_VAR_CHECK_GENERATION =3D 'PCD_VAR_CHECK_GENERATION' -TAB_DSC_DEFINES_VPD_AUTHENTICATED_VARIABLE_STORE =3D 'VPD_AUTHENTICATED_VA= RIABLE_STORE' TAB_DSC_DEFINES_FLASH_DEFINITION =3D 'FLASH_DEFINITION' TAB_DSC_DEFINES_BUILD_NUMBER =3D 'BUILD_NUMBER' TAB_DSC_DEFINES_MAKEFILE_NAME =3D 'MAKEFILE_NAME' diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 35ec5b37ff..d1ee0ccaea 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -387,10 +387,6 @@ class DscBuildData(PlatformBuildClassObject): for i in range(0, len(LanguageCodes), 3): LanguageList.append(LanguageCodes[i:i + 3]) self._ISOLanguages =3D LanguageList - elif Name =3D=3D TAB_DSC_DEFINES_VPD_AUTHENTICATED_VARIABLE_ST= ORE: - if TAB_DSC_DEFINES_VPD_AUTHENTICATED_VARIABLE_STORE not in= gCommandLineDefines: - gCommandLineDefines[TAB_DSC_DEFINES_VPD_AUTHENTICATED_= VARIABLE_STORE] =3D Record[2].strip() - elif Name =3D=3D TAB_DSC_DEFINES_VPD_TOOL_GUID: # # try to convert GUID to a real UUID value to see whether = the GUID is format --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#86014): https://edk2.groups.io/g/devel/message/86014 Mute This Topic: https://groups.io/mt/88642508/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-