From patchwork Fri Aug 19 14:25:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668167 X-Patchwork-Delegate: sjg@chromium.org 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=ChcQD08X; 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 4M8PH65pZGz1ygv for ; Sat, 20 Aug 2022 00:27:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2085884BD9; Fri, 19 Aug 2022 16:26:33 +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="ChcQD08X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 44A1084B81; Fri, 19 Aug 2022 16:26:10 +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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150088.outbound.protection.outlook.com [40.107.15.88]) (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 23B1B84B88 for ; Fri, 19 Aug 2022 16:26:03 +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=SaTT9SsLBBDDflNIctrl0oPjWPaox/W9Rd/LNc3zkIyY8WUCLuqTq5Afio5q4Vi1+Xygcc2KuGKp2dUMovyT55UAkxpOnpEtT8ev8qZsu4TlSLxCNBLzdTEzy9n4ScFVfQp6bEr3i/Pgf7zlSzcFcpFdBusljtSkY62bVLzsO6lvsBM6LJhFOIPdla585T4iMG2Fov9i+qiZhUTBSVqIp7LJbUuVwPU1QTICroWrrtnRnqnI1QBK4oS7oqNx9IWB4hbPzh0Bi2bbNh8Mrb4C8sdtWjNEc6LG+Hs5G4JS+dfsNNgrO4C9UaQ4A6EBwUoi+NoPV85Vgv6tr8yQhXz94w== 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=qKD3sQS6AucNaLjT1V130NEi+nhOsRt4H3D/tDshNoQ=; b=IYYQ6q1u6/JEg/Fw8TxJupggNCgEndizCk+IKnvVlXNnQI6GJLhvzTdK4/FkV/wpi9u3v/BOllPep8gz2S2ay4o+n7BqtmQAH4xAr+RNegYXyWAh9fOd8vrz0jS+bR7+aXG0EF+nOh5R4uEdrjQUD+JTMDMVJOI2ZBsaMrR69L7NdDP4KQT11X8D9RG25myR02c5Llk6O3+SWlzuVxGuO+Mh1NjP/mlFM1XP44v8hsoXgXttmQy0575PluzoiDTt8YlmF5orvRRFgNIfjR3vwlruPPVm8HYufcaMRwE128d7Q+vE0eJZKjIglW8LrJnpPqre1cexV3p0KEJ+Af3o/Q== 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=qKD3sQS6AucNaLjT1V130NEi+nhOsRt4H3D/tDshNoQ=; b=ChcQD08XPnfoG9gbmXWmIyOqfYsBVYq0Dz7DTKFgeLqz5Osz3GVgzDSnI80Pznl9fAfoqMkN8EIio6S8/gOhw7gPciXcF8UkL73VesuHUqxK5SNyoLUUzn91ij1vUgxhf1i2MWifAdv0H0z+7XQLyb39x/kQZy5mZDjpj2UIdAU= 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 PR3PR08MB5739.eurprd08.prod.outlook.com (2603:10a6:102:8e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Fri, 19 Aug 2022 14:26:01 +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:26:01 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v6 09/21] binman: Disable compressed data header Date: Fri, 19 Aug 2022 16:25:26 +0200 Message-Id: <20220819142538.24847-10-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220819142538.24847-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220819142538.24847-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS4PR10CA0015.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5dc::11) 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: d483aec7-26d7-46bf-cf04-08da81eebdaf X-MS-TrafficTypeDiagnostic: PR3PR08MB5739:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DFYA7ee1aAM+697nf3XlFRhXj9vR70hQd7y3L2s1Jh+eFiGpps+gHosmaVCwArvS2WF/N09QTowTKbTUqoLcX19vHqmsu09B7OjJRIgcNxeuLJHTEXWhq5Pa1HSWl962/Xm6SA+39DR0H40Ms2lHKCKG0+U2StcY8GrKinz/w/PvD4T0MT0nNB1LNu90s/VBT7dtUKWU+WjSuQrJNYAynGNdWNpQHDNyZrz6QOFSA5Y9HRJ/Rvzsn4pweC6hueCeJOWayITg+0LKWQcpCMFwu9E5sLAXOUcrG9nKoI5YqNqed5vVLDG0peoxOqtDBRKsn7IXPbQdEc9e8CI1UCHSP1KOGcqtzRV68Wyul2SVLiD0TOELWi4ADwr0L5m3/8x/FwMbufmO5fF1kvfizp2yvrdQG0ipkdxQ98JqSuO1Nv35v3nIbXnWUOT6Q2QXlMukPW5ZkEzbFdnQhFhlmRzFd2U50gwKTgTpT43aHmdlKhysUCOaxZqG/tpgvBK++d7I1pwgRbVcR9oB9qL/BNmJjnV/tQe626GXX9sWwZLjnQtTiMp4ySA7yP8WnGytu2ZdVJ2J4nTH7c0mElVthUDowxUTd6Ssce1A3/obDrvIEWzw+blypDVOGkyuWDaLGlSY8iGStwktecNnU25qdbo63W9lDdOgpbHG4B8fI7FqK90nknROtRNnfi4jQ7D3UPxdvYQZzLBH+1UgGJrt4zeXjib6O3mQLlKVuaKJkKHlXJ+F6CSkBTOnbVjIDZElNy+5 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)(396003)(366004)(376002)(136003)(346002)(39860400002)(4326008)(8676002)(66476007)(66946007)(66556008)(54906003)(316002)(6916009)(36756003)(5660300002)(8936002)(2906002)(478600001)(6486002)(41300700001)(6506007)(6666004)(6512007)(26005)(52116002)(2616005)(86362001)(1076003)(38350700002)(38100700002)(83380400001)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rzbZ8G39Ak6Ebs1tAADMQc/E7RRgKNRSzO3gEsWkbTcf+wp6SMNp4MTu3Qv4VHJTAp4c1RZDq6jqXe2Hpe28dRbOiHmHr0lCmbGUt8Cl+az2d8u7eaWTEPsyYmSdX7Sd1xqasGgHuW9gl3nUJBR4aNGHh4vzGTINfBFRmCURnM9BjowWF4KvcumykBcbQCe2lNL2hz7krUovXDjzuXHoItcEUYo9lwnqxr3+lsvnp11p8NR8s3XjHp3KhlZKzW2UlTtBn46jwkmI0Ru8QueRO8nob4fiLepMS8HiyeMvV07WqmJiZrrDOFoOrPsTasf+qs2ndopjCVMccfSSlQQ4Mun3FjmargjW1cZPgrX7R51RJwwTF1nn+q2NC1iOZjsTEBW4PIIn8dPYQZnqSTMqjUbc31z0H2iaHUIe7j9ofP9eesdUTPfchoJnIWBDFNDgesO6KDmmoUrfKtIe7ZM/yQvqAeM9lGIO6NHX34R+URRagzsKej1B2HFEIVsRQ7L0z754gJxGq3YCtYGhY7e66kDCBf994NkCKd3/V+hrDDtLjSeBrEV+hyH8MWP1ORLr40tCNs5OOXkRH1AoIfT9L9aTorOzTOqrdqhVPLWXzGMDUgPWS+9t15VQd+kKGrOP/yZI5dm8SEwXKxZuEGG0xTwBcxD+p/JyM9jCg7g0FDlpMwVxTqYUSoTDjSNqa5y6oFABult5J/HaN2EKLrhK3uM1uGa3Mfb0/KF6NiNg5V8K8pfpt97uMegl5uiZE42UG/03XoLxPTJyJl1k9cuypcg4V+OIPdVnsmGrS6W5Z95EbjBqwTUzdAak4SzK8yrZDob4atRCIahR/5OJNWIc2K4masoVSkHwBUl6UkPAZly140OCKtapR93XryozepY2OcKgkU1Y8o8+uzyR7594WbXMCMgxU+5bgkKS7MrEShDQAq8eN8AEF9BViADNUqYiRvS2SbayJr7F9egV/wF4LPvrGQb+CtKo0OU9rKPG43+Ml2ods43KF0jkPc62wMp0gk/ic6TU6+9lIKi9P5HVUS9aUWOUe6C9aDmB5Wg1cUjI3/QhW+7S0sneH2F2Wjq7DUpCjmUm7ryYTJ/wODri1ZGqR9cL8myFQlNapgsCxzPtmC/qX/ELXwpEogkNQf/se9xO+U6sLtXRWKWRUEa4N3/6UloBQ/GGmXjIk0odhM2aa5loJ9DxwBQ2wNAQ76jOS2kYkoblVUBMYYKvr0EcQmcAjBCPGdwu47MfH51QIVRH2v/4DFdtTBUgzQhYD2m0uZ+FYsWk+CuZfC1qut58cJVKNHLKJ6Gf/3XlIy6fCy7s3BA+JaiYR9RB6UG8GUtDolGVqwEPCnhn0qXTEOEVXh+6VvOce3lghY6rYreL4LeiAIOPyAmsrcPUFe4ZDCJNA8l06aZ4OTXq1je+YO/EhEVN0RuLVmVejJXoWRVttQ6zAxR90PExJGC9bqSall6Xp79bjcqCO8L9P/Noy405/vtxvbFbYd5Um1EwMDxFQu5G8jwsv9KAoojvjxk8wZ2bjZhHly7NvgKPKQz3NaAdtsNEpNbUMSyXq2wAP6J8Ro2BKMD7bQEdeonTZ/mBuUSEZvB0+/F83SV3saoa0EAbqA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: d483aec7-26d7-46bf-cf04-08da81eebdaf 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:26:01.2055 (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: 3lsrsac+Cv5FoQO/N3Fgpgk8/9sNCA2TqJNLz8EUu1Zyvct1HoZ/4pmOwhn03C4q3doso1pQugkWIGaonrKUow== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5739 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 Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- (no changes since v5) 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):