From nobody Sun May 11 13:14:38 2025 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 --- 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