From nobody Tue May 7 19:41:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 153288767257095.17367034036295; Sun, 29 Jul 2018 11:07:52 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 72DAF210C4DCD; Sun, 29 Jul 2018 11:07:49 -0700 (PDT) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 08206210C4DBF for ; Sun, 29 Jul 2018 11:07:48 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:47 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:47 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539724" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Sun, 29 Jul 2018 11:07:36 -0700 Message-Id: <20180729180743.1648-2-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [edk2] [staging/FmpDevicePkg-master 1/8] BaseTools/Capsule: Add max value checks to Capsule Generation tools X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1021 https://bugzilla.tianocore.org/show_bug.cgi?id=3D1022 https://bugzilla.tianocore.org/show_bug.cgi?id=3D1026 Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu =20 --- BaseTools/Source/Python/Capsule/GenerateCapsule.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools= /Source/Python/Capsule/GenerateCapsule.py index 4018dc0420..5398c12a9c 100644 --- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py +++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py @@ -298,6 +298,12 @@ if __name__ =3D=3D '__main__': parser.error ('--capflag PopulateSystemTable also requires= --capflag PersistAcrossReset') if 'InitiateReset' in args.CapsuleFlag: parser.error ('--capflag InitiateReset also requires --cap= flag PersistAcrossReset') + if args.CapsuleOemFlag > 0xFFFF: + parser.error ('--capoemflag must be an integer between 0x0000 = and 0xffff') + if args.HardwareInstance > 0xFFFFFFFFFFFFFFFF: + parser.error ('--hardware-instance must be an integer in range= 0x0..0xffffffffffffffff') + if args.MonotonicCount > 0xFFFFFFFFFFFFFFFF: + parser.error ('--monotonic-count must be an integer in range 0= x0..0xffffffffffffffff') =20 UseSignTool =3D args.SignToolPfxFile is not None UseOpenSsl =3D (args.OpenSslSignerPrivateCertFile is not None and @@ -319,6 +325,10 @@ if __name__ =3D=3D '__main__': if args.Encode and (UseSignTool or UseOpenSsl): if args.FwVersion is None or args.LowestSupportedVersion is No= ne: parser.error ('the following options are required: --fw-ve= rsion, --lsv') + if args.FwVersion > 0xFFFFFFFF: + parser.error ('--fw-version must be an integer in range 0x= 0..0xffffffff') + if args.LowestSupportedVersion > 0xFFFFFFFF: + parser.error ('--lsv must be an integer in range 0x0..0xff= ffffff') =20 if UseSignTool: args.SignToolPfxFile.close() --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue May 7 19:41:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1532887676425242.12056081906587; Sun, 29 Jul 2018 11:07:56 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A545C210C4DD2; Sun, 29 Jul 2018 11:07:49 -0700 (PDT) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1DDF1210C4DC2 for ; Sun, 29 Jul 2018 11:07:48 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:47 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:47 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539730" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Sun, 29 Jul 2018 11:07:37 -0700 Message-Id: <20180729180743.1648-3-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [edk2] [staging/FmpDevicePkg-master 2/8] BaseTools/Capsule: Remove support for PopulateSystemTable X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1030 Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu =20 --- BaseTools/Source/Python/Capsule/GenerateCapsule.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools= /Source/Python/Capsule/GenerateCapsule.py index 5398c12a9c..34337b2710 100644 --- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py +++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py @@ -239,8 +239,8 @@ if __name__ =3D=3D '__main__': # Add optional arguments for this command # parser.add_argument ("--capflag", dest =3D 'CapsuleFlag', action=3D'ap= pend', default =3D [], - choices=3D['PersistAcrossReset', 'PopulateSystemT= able', 'InitiateReset'], - help =3D "Capsule flag can be PersistAcrossReset,= or PopulateSystemTable or InitiateReset or not set") + choices=3D['PersistAcrossReset', 'InitiateReset'], + help =3D "Capsule flag can be PersistAcrossReset = or InitiateReset or not set") parser.add_argument ("--capoemflag", dest =3D 'CapsuleOemFlag', type = =3D ValidateUnsignedInteger, default =3D 0x0000, help =3D "Capsule OEM Flag is an integer between = 0x0000 and 0xffff.") =20 @@ -294,8 +294,6 @@ if __name__ =3D=3D '__main__': if args.Guid is None: parser.error ('the following option is required: --guid') if 'PersistAcrossReset' not in args.CapsuleFlag: - if 'PopulateSystemTable' in args.CapsuleFlag: - parser.error ('--capflag PopulateSystemTable also requires= --capflag PersistAcrossReset') if 'InitiateReset' in args.CapsuleFlag: parser.error ('--capflag InitiateReset also requires --cap= flag PersistAcrossReset') if args.CapsuleOemFlag > 0xFFFF: @@ -421,7 +419,7 @@ if __name__ =3D=3D '__main__': try: UefiCapsuleHeader.OemFlags =3D args.CapsuleOemFlag UefiCapsuleHeader.PersistAcrossReset =3D 'PersistAcrossReset'= in args.CapsuleFlag - UefiCapsuleHeader.PopulateSystemTable =3D 'PopulateSystemTable= ' in args.CapsuleFlag + UefiCapsuleHeader.PopulateSystemTable =3D False UefiCapsuleHeader.InitiateReset =3D 'InitiateReset' = in args.CapsuleFlag UefiCapsuleHeader.Payload =3D Result Result =3D UefiCapsuleHeader.Encode () --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue May 7 19:41:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1532887679353291.80579007153347; Sun, 29 Jul 2018 11:07:59 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D11B321BADAB2; Sun, 29 Jul 2018 11:07:49 -0700 (PDT) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4857B21BADAB2 for ; Sun, 29 Jul 2018 11:07:48 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:48 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:47 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539733" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Sun, 29 Jul 2018 11:07:38 -0700 Message-Id: <20180729180743.1648-4-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [edk2] [staging/FmpDevicePkg-master 3/8] BaseTools/Capsule: Fix CertType GUID byte order X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1024 Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu =20 --- BaseTools/Source/Python/Common/Uefi/Capsule/FmpAuthHeader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Common/Uefi/Capsule/FmpAuthHeader.py b= /BaseTools/Source/Python/Common/Uefi/Capsule/FmpAuthHeader.py index aec52bf772..ae5c1df8a4 100644 --- a/BaseTools/Source/Python/Common/Uefi/Capsule/FmpAuthHeader.py +++ b/BaseTools/Source/Python/Common/Uefi/Capsule/FmpAuthHeader.py @@ -166,7 +166,7 @@ class FmpAuthHeaderClass (object): self.dwLength =3D dwLength self.wRevision =3D wRevision self.wCertificateType =3D wCertificateType - self.CertType =3D uuid.UUID (bytes =3D CertType) + self.CertType =3D uuid.UUID (bytes_le =3D CertType) self.CertData =3D Buffer[self._StructSize:self._MonotonicC= ountSize + self.dwLength] self.Payload =3D Buffer[self._MonotonicCountSize + self.d= wLength:] self._Valid =3D True --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue May 7 19:41:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1532887682726581.2026828885713; Sun, 29 Jul 2018 11:08:02 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 0CD30210C512E; Sun, 29 Jul 2018 11:07:52 -0700 (PDT) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9A10B21BADAB2 for ; Sun, 29 Jul 2018 11:07:48 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:48 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:48 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539736" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Sun, 29 Jul 2018 11:07:39 -0700 Message-Id: <20180729180743.1648-5-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [edk2] [staging/FmpDevicePkg-master 4/8] BaseTools/Capsule: Do not support -o with --dump-info X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1025 Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu =20 --- BaseTools/Source/Python/Capsule/GenerateCapsule.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools= /Source/Python/Capsule/GenerateCapsule.py index 34337b2710..3c641bdca7 100644 --- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py +++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py @@ -339,6 +339,10 @@ if __name__ =3D=3D '__main__': args.OpenSslOtherPublicCertFile =3D args.OpenSslOtherPublicC= ertFile.name args.OpenSslTrustedPublicCertFile =3D args.OpenSslTrustedPubli= cCertFile.name =20 + if args.DumpInfo: + if args.OutputFile is not None: + parser.error ('the following option is not supported for dumpi= nfo operations: --output') + # # Read binary input file # --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue May 7 19:41:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1532887686349167.37408668328078; Sun, 29 Jul 2018 11:08:06 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3D64F210C5132; Sun, 29 Jul 2018 11:07:52 -0700 (PDT) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4EB8D210C4DC6 for ; Sun, 29 Jul 2018 11:07:50 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:50 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:48 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539739" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Sun, 29 Jul 2018 11:07:40 -0700 Message-Id: <20180729180743.1648-6-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [edk2] [staging/FmpDevicePkg-master 5/8] BaseTools/Capsule: Update help for --fw-version and --lsv X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update help to state that --fw-version and -=3D-lsv are required for encode operations that sign a payload. https://bugzilla.tianocore.org/show_bug.cgi?id=3D1029 Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu =20 --- BaseTools/Source/Python/Capsule/GenerateCapsule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools= /Source/Python/Capsule/GenerateCapsule.py index 3c641bdca7..76426dcf66 100644 --- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py +++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py @@ -254,9 +254,9 @@ if __name__ =3D=3D '__main__': help =3D "64-bit monotonic count value in header.= Default is 0x0000000000000000.") =20 parser.add_argument ("--fw-version", dest =3D 'FwVersion', type =3D Va= lidateUnsignedInteger, - help =3D "The 32-bit version of the binary payloa= d (e.g. 0x11223344 or 5678).") + help =3D "The 32-bit version of the binary payloa= d (e.g. 0x11223344 or 5678). Required for encode operations that sign a pa= yload.") parser.add_argument ("--lsv", dest =3D 'LowestSupportedVersion', type = =3D ValidateUnsignedInteger, - help =3D "The 32-bit lowest supported version of = the binary payload (e.g. 0x11223344 or 5678).") + help =3D "The 32-bit lowest supported version of = the binary payload (e.g. 0x11223344 or 5678). Required for encode operatio= ns that sign a payload.") =20 parser.add_argument ("--pfx-file", dest=3D'SignToolPfxFile', type=3Dar= gparse.FileType('rb'), help=3D"signtool PFX certificate filename.") --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue May 7 19:41:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 153288769285441.07124334246748; Sun, 29 Jul 2018 11:08:12 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9A188210C5139; Sun, 29 Jul 2018 11:07:52 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B0AA1210C4DD9 for ; Sun, 29 Jul 2018 11:07:50 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:48 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:48 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539742" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Sun, 29 Jul 2018 11:07:41 -0700 Message-Id: <20180729180743.1648-7-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [edk2] [staging/FmpDevicePkg-master 6/8] BaseTools/Capsule: Update file header with tool limitations X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update file header to state that the tool does not support: * Multiple payloads * Drivers * Vendor code bytes https://bugzilla.tianocore.org/show_bug.cgi?id=3D1031 Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu =20 --- BaseTools/Source/Python/Capsule/GenerateCapsule.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools= /Source/Python/Capsule/GenerateCapsule.py index 76426dcf66..d829000849 100644 --- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py +++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py @@ -1,6 +1,17 @@ ## @file # Generate a capsule. # +# This tool generates a UEFI Capsule around an FMP Capsule. The capsule p= ayload +# be signed using signtool or OpenSSL and if it is signed the signed conte= nt +# includes an FMP Payload Header. +# +# This tool is intended to be used to generate UEFI Capsules to update the +# system firmware or device firmware for integrated devices. In order to +# keep the tool as simple as possible, it has the following limitations: +# * Do not support multiple payloads in a capsule. +# * Do not support optional drivers in a capsule. +# * Do not support vendor code bytes in a capsule. +# # Copyright (c) 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BS= D License --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue May 7 19:41:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1532887689577282.60504975438903; Sun, 29 Jul 2018 11:08:09 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6C9E621BADAB9; Sun, 29 Jul 2018 11:07:52 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8AF29210C4DC6 for ; Sun, 29 Jul 2018 11:07:50 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:48 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:49 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539748" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Sun, 29 Jul 2018 11:07:42 -0700 Message-Id: <20180729180743.1648-8-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [edk2] [staging/FmpDevicePkg-master 7/8] BaseTools/Capsule: Prevent traceback during signing operations X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1046 https://bugzilla.tianocore.org/show_bug.cgi?id=3D1048 https://bugzilla.tianocore.org/show_bug.cgi?id=3D1050 Remove raise statements that generate Tracebacks that were only intended for development/debug. With the raise statements removed proper error messages are shown. Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu =20 --- BaseTools/Source/Python/Capsule/GenerateCapsule.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools= /Source/Python/Capsule/GenerateCapsule.py index d829000849..42cd1fb8ba 100644 --- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py +++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py @@ -408,7 +408,6 @@ if __name__ =3D=3D '__main__': ) except: print ('GenerateCapsule: error: can not sign payload') - raise sys.exit (1) =20 try: @@ -496,7 +495,6 @@ if __name__ =3D=3D '__main__': print ('=3D=3D=3D=3D=3D=3D=3D=3D') except: print ('GenerateCapsule: error: can not decode capsule') - raise sys.exit (1) =20 elif args.DumpInfo: --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue May 7 19:41:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 153288769611458.15023446600969; Sun, 29 Jul 2018 11:08:16 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C6E2A210C513D; Sun, 29 Jul 2018 11:07:52 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D4AC9210C4DC6 for ; Sun, 29 Jul 2018 11:07:50 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:48 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:49 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539751" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Sun, 29 Jul 2018 11:07:43 -0700 Message-Id: <20180729180743.1648-9-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [edk2] [staging/FmpDevicePkg-master 8/8] BaseTools/Capsule: Support capsules without a payload header X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1028 Update --dump-info and --decode to show auth header infomation even if a payload header is not present. The --decode operation still fails if a payload header is not present. Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu =20 --- BaseTools/Source/Python/Capsule/GenerateCapsule.py | 34 +++++++++++++++---= ---- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools= /Source/Python/Capsule/GenerateCapsule.py index 42cd1fb8ba..7b08918857 100644 --- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py +++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py @@ -455,6 +455,9 @@ if __name__ =3D=3D '__main__': FmpCapsuleHeader.DumpInfo () if UseSignTool or UseOpenSsl: Result =3D FmpAuthHeader.Decode (Result) + if args.Verbose: + print ('--------') + FmpAuthHeader.DumpInfo () =20 # # Verify Image with 64-bit MonotonicCount appended to end = of image @@ -479,20 +482,25 @@ if __name__ =3D=3D '__main__': except ValueError: print ('GenerateCapsule: warning: can not verify paylo= ad.') =20 - Result =3D FmpPayloadHeader.Decode (Result) - if args.Verbose: - print ('--------') - FmpAuthHeader.DumpInfo () - print ('--------') - FmpPayloadHeader.DumpInfo () + try: + Result =3D FmpPayloadHeader.Decode (Result) + if args.Verbose: + print ('--------') + FmpPayloadHeader.DumpInfo () + print ('=3D=3D=3D=3D=3D=3D=3D=3D') + except: + if args.Verbose: + print ('--------') + print ('No FMP_PAYLOAD_HEADER') + print ('=3D=3D=3D=3D=3D=3D=3D=3D') + raise else: if args.Verbose: print ('--------') print ('No EFI_FIRMWARE_IMAGE_AUTHENTICATION') print ('--------') print ('No FMP_PAYLOAD_HEADER') - if args.Verbose: - print ('=3D=3D=3D=3D=3D=3D=3D=3D') + print ('=3D=3D=3D=3D=3D=3D=3D=3D') except: print ('GenerateCapsule: error: can not decode capsule') sys.exit (1) @@ -508,11 +516,15 @@ if __name__ =3D=3D '__main__': FmpCapsuleHeader.DumpInfo () try: Result =3D FmpAuthHeader.Decode (Result) - Result =3D FmpPayloadHeader.Decode (Result) print ('--------') FmpAuthHeader.DumpInfo () - print ('--------') - FmpPayloadHeader.DumpInfo () + try: + Result =3D FmpPayloadHeader.Decode (Result) + print ('--------') + FmpPayloadHeader.DumpInfo () + except: + print ('--------') + print ('No FMP_PAYLOAD_HEADER') except: print ('--------') print ('No EFI_FIRMWARE_IMAGE_AUTHENTICATION') --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel