From patchwork Fri Aug 19 14:00:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=tHzLvlPn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M8NkF3Nn3z1ygd for ; Sat, 20 Aug 2022 00:02:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B33984B72; Fri, 19 Aug 2022 16:01:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="tHzLvlPn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BAB3584B55; Fri, 19 Aug 2022 16:01:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 072C984981 for ; Fri, 19 Aug 2022 16:01:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTJgjDohyECIob6ZY/6ZzT+jjf0m8xZekFjD+4vgUpcDbPgGspH5xSdyW60N669WcZjh8fXeZSSzgKcLftS/luuvBUEHyrVBXh2UTX4PdC/4NKCbos+sRyDwkhDwknqh39etlEZQqk2q4vN1WsEHdQtr+UKVkHKrPd+maSV2udb2TUnp/B4rpBCtnWHfFfbSxLfiOf5tK587LRKgJ8gto1FbGEKGVjIbP/Gpt+VmokRwYfWlQvDjPlzXu+eBgqLvVo2Ya5It5lPeacjuxV4HNQk0rnyIPn0ajPOXIBN/wUIBLXoZTnFJuljcmyvyzE8EMYUygqgKQCt69Jas8FpmXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pTX18/YswGjYPWCsGlnujFUdniknIpk1tv0Or4VlDd4=; b=nTqwrmU2eYJGYnFuhBepv3ft47wLZX/Wo+0NEKwzhrIaoUnJZbtrohuRHVAPw3rBoRp9zv8ReLRkGzP/2sx9DhHJMRgAJdVFzMSnvarI0fEOWAiEtIdpf3TPNrsV3eMsrBHq8plhlvfkewy6wgt+xErcpIxmWtRV+R3QUCgww8dT6t5r/9iWE6O2xKgkaRKkbSXdyQyH8Ho7FMEdJmacOppSMVUtCzI+TBPIEeML6Df7RhKKeZcpWSFjskGguLVYPLAqvb1yKAuVAsTUY/fuqn8F/Gt1j7lXpJJh3FUyMriasMiak53/KF8QxMuN1/+aKyCIstgxRN8niHfhJqxjjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pTX18/YswGjYPWCsGlnujFUdniknIpk1tv0Or4VlDd4=; b=tHzLvlPnZTuHGwupwLd/yVrxOg1U3TVTM4fwbELMLfiT1Roz9oO9PBGBa7HoHPIDzoqoIqwZHNe74wUasz6e0dJiTIj+IsoJ9evmvThOPYE3vQIsgYg7OtnsoQSnv22GWmBzkCOqXxBcMhSLFCARHhd9Fg9u7SbWd2xVNoUPpi4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DU2PR08MB7373.eurprd08.prod.outlook.com (2603:10a6:10:2f1::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Fri, 19 Aug 2022 14:00:58 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44%3]) with mapi id 15.20.5546.018; Fri, 19 Aug 2022 14:00:58 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 09/21] binman: Disable compressed data header Date: Fri, 19 Aug 2022 16:00:23 +0200 Message-Id: <20220819140035.32760-10-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220819140035.32760-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220819140035.32760-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS4P251CA0011.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::7) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb85cf1c-c943-452d-8782-08da81eb3dde X-MS-TrafficTypeDiagnostic: DU2PR08MB7373:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OP7HJU/xQjA5C9PazuAPQajjI+UCO/tc9xNFB5H+NRgjt6yYjNArRDYd+3dJpxCu+UP3jvJTbAhy3CSSFYf6f3vNaPagK6vqQ/kHPnHWLNm+3/hGhxb2WV35xTqhpzYRGcvZHJHfpeblofVQNytwpozucOwBqkcytbSfa8SUxsgeSg/GTdNeZ2sh76igGYjL2ijWhHz8SdtXEeKhOlwJnzq5i3MqmBHDedNQ27314pvY8bif5HPNgBoR5ZN8djooiDMHLjhcglzCcvLLDMugHGT/jMw+71RpMDCTkTgTmS4Eppt7iIJcnJeeKngeDq9QvIWsr63OXIlTiOZNl/hktshUd/Zih++dHO+jvlcyF33DuA8aVewFxYATzIZ0eQZmu5eJPUDilSPz37Yw59YNQJGqk7QW8q1T7mlzOwjezKWCV/42YOjlniMCAE/jtl2wzRok9grQSEcHScXhmlvga9TyLS7nVzNGk7MiNpJIaEquGw7o1Va1+p7lRib4NtkuEsGaJsdesfoRF5z0TeopsSb0r2C4aFtqsYiuwDc8kJbIYDz8fwnbRFElCKclmPmJkazYUcTgVTtzUMkZsdmqHpzQOWvkY66N1FMa356Ix+9tTPRdsMLvQLRTPICg5XmW47PUyMjoXXaj/5IbXR78FuQXsVbCTZWZqUP8y1aInBJHK6oIyJ87tPyUTrdqpk9fTpLq0ZQM3cEhmFHISmtb00Vua7OXDbvAV7UrnqOyjxx257H4gM5C7Vf6UKZbdRzJDD0vUOoLDxLNd5QwQQeUUw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(366004)(136003)(396003)(376002)(4326008)(41300700001)(52116002)(6506007)(6666004)(186003)(38100700002)(36756003)(54906003)(6916009)(5660300002)(38350700002)(8936002)(316002)(2906002)(26005)(1076003)(83380400001)(8676002)(6486002)(86362001)(478600001)(6512007)(66946007)(66556008)(66476007)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s3BaEbFQlMFyU627M2lJIUOR48GlN2hyBxnb70sAgjFMt2a+VmgcnsLBR6CLnqX+WtiCZJgspZHDTT6yHs/ipxDQyMUlhBiLR/HD098SnCaX1wkA05D5vk876f0bFT5qnicmLLqh01DqhkPUPnV3Nx6b8SwmGtiCQ8GU+FS7dqOl0aReo/W13zNfWl36jCLObanYU8VzntGR1HhbsrWtZjvSRMWGAcFLXLt+RLXohSwt8vjGUSu8qMoQgShQLBqahpay6OU/8gTGWuv+1O0MRNTf/ivTSWtYZT2DTL3nURGYK2GIdToD7va9N22Qe9It5yfq880HJxMGrSws09ZZRvzZYGSK1C/jgi9fML+sPV/fYP1eoLXhpLlJrciklC0rWF0mXW8B26Fr87BdPuA35YAjOKfGqFVExnxRuB5Fs/++4pjmoCQurtjyeSHrwo8u11dynWQgbT6vjDprVTcPklgim1m7NJ3LMBuyasw3IYfjR4kJKOOSnl0AmgTTe5+vPtl8JInSV2z4LMsRvcq7sdWxFIpCUGXZ93vo47VTHRoVYXWhMPnXvC1fQse8w/AhJwJYHuM8R80tdIuZpMys/4VdML8VeU58xJ+qqc0fmoUPWo3y/PjhH/8sZeqniM8EgeYKy7WdJo06uLN0970h3Zv1XVQ1YnwtZzYRMaGT+LYgZ0F4tw4z9DwZ5sO3JezrWmjLAG4xvY68mNCgAm59pTXH8CuJ1UHNI+zkh0+lA9LCoh9cWl2MiFvg1j6QjMbgNlnz7G8f5VNbAkWhy/qNDSXdWdBWYS1JzDDRi1t6SRW8Km+TvBtCqXXjr8sqMBFMEbZp25P/CwsO98emmWfsrx7w47kldSXUXlWwCr+b4yhjhuiLaJ7xb0bB0bXC/dU2xxebRbSQ2Xf58OTc1eCcBEpDAOAsRpky/opCwcb8j8cZbEbBMhu/AGUpY7iBr8yMt/MGqFb0oeXRpuXeo/8TJ753T3a2g5xrhxIuS2Rswwd3skeXx1KhhGWPygfEyez4ACEFJl/pfIjkPNsprxJXuv25PUeZ3J3KBFDLVlqo57A9C9xndkvU4MQWiIm4lABLnnyVhBbFh53LxNagI367ODkgqaE1d4M3m5DoYBmINMA8XCmI+xFyqQe/0OsJ0GZBDYQic/4VRjjeoPVR9lSFTiPk4ZlsMlNEj/8N8C9y/cDi1vb1OSDjvJ/nG32h/EDp/mG2l/7gxRDbgIsOUDfhSzyfa58Istb4gSsXP5zQpyISe95ntwCcR950h/DymqCACZ7fMNLmwaf9u3ad/GuE6qCjmn3pyZsDVR4PmOGmMJw2AWocWoH43A/zBGcrsWP/lLVPDHzQacUgIEgHrbOsk8ZfzSu3ZtF4akgA1UhTLa0Z0A7wLMW8PkAKAwhB6c/S3BML2KlJP4w7l6cTaoQmknse2mRy9Jpif6PFrx87D3Ql1p3BEPxB/4FTZaYXneVK9im5BvZw/v0YCImypWdQ54AqYsq5oNaq+Z7zN4qqcmRwuKPAWfHKtCPzutq08M6/Kcx58fDAFJWs+PtltkZzwX1ai/WNhP8/5TgFETFWUR3e7sPGoPglSAltwD7YlzBna8vaBrfjbNk/CX4ssXkFfg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb85cf1c-c943-452d-8782-08da81eb3dde X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2022 14:00:58.2575 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4qigBmoUmuYOEqP9oToYtA+POY7+th2aa7YcYD2eyZe1SrEPJuYJE/4JnF1LBHxJ8Pm6wCfnAA3Xkw+i4QkYqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB7373 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier Disable the compressed data header of the utilities to compress and decompress data. The header is uncommon, not supported by U-Boot and incompatible with external compressed artifacts. The header was introduced as part of commit eb0f4a4cb402 ("binman: Support replacing data in a cbfs") to allow device tree entries to be larger than the compressed contents. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Disable header in testInvalidCompress function Changes in v3: - Add commit to disable compressed data header tools/binman/entry.py | 4 ++-- tools/binman/ftest.py | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 6d58410e91..ecce721ac6 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1083,7 +1083,7 @@ features to produce new behaviours. self.uncomp_data = indata if self.compress != 'none': self.uncomp_size = len(indata) - data = comp_util.compress(indata, self.compress) + data = comp_util.compress(indata, self.compress, with_header=False) return data def DecompressData(self, indata): @@ -1095,7 +1095,7 @@ features to produce new behaviours. Returns: Decompressed data """ - data = comp_util.decompress(indata, self.compress) + data = comp_util.decompress(indata, self.compress, with_header=False) if self.compress != 'none': self.uncomp_size = len(data) self.uncomp_data = data diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 6e63b7c27a..edee1f3984 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -1967,7 +1967,7 @@ class TestFunctional(unittest.TestCase): self._ResetDtbs() def _decompress(self, data): - return comp_util.decompress(data, 'lz4') + return comp_util.decompress(data, 'lz4', with_header=False) def testCompress(self): """Test compression of blobs""" @@ -4427,14 +4427,16 @@ class TestFunctional(unittest.TestCase): rest = base[len(U_BOOT_DATA):] # Check compressed data - expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4') + expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4', + with_header=False) data1 = rest[:len(expect1)] section1 = self._decompress(data1) self.assertEquals(expect1, data1) self.assertEquals(COMPRESS_DATA + U_BOOT_DATA, section1) rest1 = rest[len(expect1):] - expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4') + expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4', + with_header=False) data2 = rest1[:len(expect2)] section2 = self._decompress(data2) self.assertEquals(expect2, data2) @@ -5219,11 +5221,11 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testInvalidCompress(self): with self.assertRaises(ValueError) as e: - comp_util.compress(b'', 'invalid') + comp_util.compress(b'', 'invalid', with_header=False) self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) with self.assertRaises(ValueError) as e: - comp_util.decompress(b'1234', 'invalid') + comp_util.decompress(b'1234', 'invalid', with_header=False) self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) def testBintoolDocs(self):