Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2206460/?format=api
{ "id": 2206460, "url": "http://patchwork.ozlabs.org/api/patches/2206460/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260306181304.2426352-19-sjg@chromium.org/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260306181304.2426352-19-sjg@chromium.org>", "list_archive_url": null, "date": "2026-03-06T18:12:46", "name": "[v2,18/23] binman: test: Move FIT signing test data to test/fit/", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "98c2414dc2644af6dd52b702a2782b22fb744b65", "submitter": { "id": 6170, "url": "http://patchwork.ozlabs.org/api/people/6170/?format=api", "name": "Simon Glass", "email": "sjg@chromium.org" }, "delegate": { "id": 3184, "url": "http://patchwork.ozlabs.org/api/users/3184/?format=api", "username": "sjg", "first_name": "Simon", "last_name": "Glass", "email": "sjg@chromium.org" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20260306181304.2426352-19-sjg@chromium.org/mbox/", "series": [ { "id": 494765, "url": "http://patchwork.ozlabs.org/api/series/494765/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=494765", "date": "2026-03-06T18:12:28", "name": "binman: test: Organise test files into subdirectories", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/494765/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2206460/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2206460/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256\n header.s=google header.b=IAsA5oM6;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org\n header.b=\"IAsA5oM6\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=sjg@chromium.org" ], "Received": [ "from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fSF3b4VC8z1xxS\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 07 Mar 2026 05:16:43 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 408D284068;\n\tFri, 6 Mar 2026 19:14:19 +0100 (CET)", "by phobos.denx.de (Postfix, from userid 109)\n id 37F2984067; Fri, 6 Mar 2026 19:14:18 +0100 (CET)", "from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com\n [IPv6:2607:f8b0:4864:20::72e])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id EA7818401A\n for <u-boot@lists.denx.de>; Fri, 6 Mar 2026 19:14:15 +0100 (CET)", "by mail-qk1-x72e.google.com with SMTP id\n af79cd13be357-8cd767d2d70so4786985a.3\n for <u-boot@lists.denx.de>; Fri, 06 Mar 2026 10:14:15 -0800 (PST)", "from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n af79cd13be357-8cd6f5736c0sm155930885a.49.2026.03.06.10.14.12\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 06 Mar 2026 10:14:13 -0800 (PST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=chromium.org; s=google; t=1772820854; x=1773425654; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=T54+6IIkF3Oxy41ODbMVjmE2DIPJ3EYVV1g6uvRhf+U=;\n b=IAsA5oM6duxEoTZx4Znt4e1dnYlcTsp1+1Tnlds6JCWVSkdgToVN0+qytYkfabjPhR\n tqKMplwtvpWq+e17LitUVlkTSMGyyZXQuKnkEe/AY1t7tnZk0RGQGUJIn3EBRJKWR0ST\n kyG8j/L/ohfpuQcbDk1UYXvkN9N3ie788JX64=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1772820854; x=1773425654;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=T54+6IIkF3Oxy41ODbMVjmE2DIPJ3EYVV1g6uvRhf+U=;\n b=g3CYGIfT8rqUoyzN+4dLTeXHyeMT59IHs11l1QP6pyXR/McdWmqOovk4C6m8fcPirt\n rvI96nxrHNoTJe4/PyU750hxITbh/Q64uXga0TrKKAlsti5nSDXwPUkeXRGl3r7tY7RL\n xf0qp3DwNlxCQTHbfe4BJxjgM5uU7Q9ptlc5qT8hgx0SDTVtw4Hm8ZFD3Bcs3lgjqJw/\n adU3Kg7wybeXkhgXChFPhOqnI4DEQfm9RL22/egN9yTOMKbyCnFuC+DwGFhVDR1Isyfk\n oHEiLBwp6Q6wUAqfLoGh/gupUIWmeh1XowkhcYqRmYnLBTkRl55BT4ovxBwkGq+d0SHc\n GNsw==", "X-Gm-Message-State": "AOJu0YzuTjyPUgkRz7cnUQ/jP9C8u8x/+fBNH5V9+Ebnl7q9YduMViLA\n G5DMaRQlCnkp9dITkZX5uq6UHZaO3dbVB6l5+44DwPLnS7suXRqR8UxUwDnhQT6AK8yg5JCgYpo\n rgdA=", "X-Gm-Gg": "ATEYQzwA/ne8vTnqie+HRW2DA7vujzfjXTJxUtPzR0ggDPJ2DavhcHN3hgtdX/a7QP7\n 28Oyxr7IO0r3AFminWxFiBTeNB2q/T3M0FOcVqTdfepyLsDHy3S+TK3JrFi5QGXheOuvudpxBz6\n VqDzqW+nSaWGWSxrUZSViC9vHZ7MwDBTI6bvAQnj7cKSMbTgsfkVCgbII4EYv1RkFq3knuM0DdR\n ZCeMN2GOO++G10R9tE6FMpvuZ2dLm6CaYjbhoPw33KaofPaXa//nulGgj0jbDSuuYjBCIW0TyQg\n HcZeJJ4lOQ4drutS+Ie05aXsqWtVhaN6Ao90tGutAB1Y4Nw+hcLojJYDfxJWuIloPSzjZVJBt6q\n 7dWYhG+1ifL+K9SrVBdcZ96CypkAbvmHqpl9Oe2ZnZTl8UR+Dz7WhD7OcyVJgUaFPmraeI2bl2R\n bOWlWgSUKevgyxpYF++w==", "X-Received": "by 2002:a05:620a:290e:b0:8cb:d9a2:1347 with SMTP id\n af79cd13be357-8cd6d464c4amr380992485a.57.1772820854230;\n Fri, 06 Mar 2026 10:14:14 -0800 (PST)", "From": "Simon Glass <sjg@chromium.org>", "To": "u-boot@lists.denx.de", "Cc": "Tom Rini <trini@konsulko.com>, Quentin Schulz <quentin.schulz@cherry.de>,\n Simon Glass <simon.glass@canonical.com>,\n Alper Nebi Yasak <alpernebiyasak@gmail.com>,\n Aristo Chen <jj251510319013@gmail.com>, Bryan Brattlof <bb@ti.com>,\n Neha Malcom Francis <n-francis@ti.com>, Peng Fan <peng.fan@nxp.com>,\n Philippe Reynes <philippe.reynes@softathome.com>,\n Simon Glass <sjg@chromium.org>,\n Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>,\n Yannic Moog <y.moog@phytec.de>", "Subject": "[PATCH v2 18/23] binman: test: Move FIT signing test data to\n test/fit/", "Date": "Fri, 6 Mar 2026 11:12:46 -0700", "Message-ID": "<20260306181304.2426352-19-sjg@chromium.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260306181304.2426352-1-sjg@chromium.org>", "References": "<20260306181304.2426352-1-sjg@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "From: Simon Glass <simon.glass@canonical.com>\n\nMove the signing-related test data (keys, certificates, OpenSSL and\nSoftHSM2 configuration, dummy engine source) into the fit/ subdirectory\nalongside the FIT DTS test files. Drop the 340_ prefix from files that\nhad it. Update the Makefile and all ftest.py references.\n\nSigned-off-by: Simon Glass <simon.glass@canonical.com>\n---\n\nChanges in v2:\n- Add new patch to move FIT signing test data\n\n tools/binman/ftest.py | 20 +++++++++---------\n tools/binman/test/Makefile | 2 +-\n tools/binman/test/{ => fit}/aes256.bin | Bin\n .../binman/test/{ => fit}/dummy-rsa-engine.c | 0\n .../dummy-rsa4096.crt} | 0\n .../{340_openssl.conf => fit/openssl.conf} | 0\n .../test/{340_rsa2048.key => fit/rsa2048.key} | 0\n .../{340_softhsm2.conf => fit/softhsm2.conf} | 0\n 8 files changed, 11 insertions(+), 11 deletions(-)\n rename tools/binman/test/{ => fit}/aes256.bin (100%)\n rename tools/binman/test/{ => fit}/dummy-rsa-engine.c (100%)\n rename tools/binman/test/{340_dummy-rsa4096.crt => fit/dummy-rsa4096.crt} (100%)\n rename tools/binman/test/{340_openssl.conf => fit/openssl.conf} (100%)\n rename tools/binman/test/{340_rsa2048.key => fit/rsa2048.key} (100%)\n rename tools/binman/test/{340_softhsm2.conf => fit/softhsm2.conf} (100%)", "diff": "diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py\nindex 601d1f7eb8c..76d17e6d986 100644\n--- a/tools/binman/ftest.py\n+++ b/tools/binman/ftest.py\n@@ -7927,7 +7927,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n 'default-dt': 'test-fdt1',\n 'atf-bl31-path': 'bl31.elf',\n }\n- data = tools.read_file(self.TestFile(\"340_rsa2048.key\"))\n+ data = tools.read_file(self.TestFile(\"fit/rsa2048.key\"))\n self._MakeInputFile(\"keys/rsa2048.key\", data)\n \n test_subdir = os.path.join(self._indir, TEST_FDT_SUBDIR)\n@@ -7964,7 +7964,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n 'atf-bl31-path': 'bl31.elf',\n }\n \n- x509_pubkey = '340_dummy-rsa4096.crt'\n+ x509_pubkey = 'fit/dummy-rsa4096.crt'\n data = tools.read_file(self.TestFile(x509_pubkey))\n self._MakeInputFile('dev.crt', data)\n \n@@ -8039,7 +8039,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n \n prefix = \"testFitSignPKCS11Simple.\"\n # Configure SoftHSMv2\n- data = tools.read_file(self.TestFile('340_softhsm2.conf'))\n+ data = tools.read_file(self.TestFile('fit/softhsm2.conf'))\n softhsm2_conf = self._MakeInputFile(f'{prefix}softhsm2.conf', data)\n softhsm2_tokens_dir = self._MakeInputDir(f'{prefix}softhsm2.tokens')\n \n@@ -8070,7 +8070,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n test_subdir = os.path.join(self._indir, TEST_FDT_SUBDIR)\n \n # Make OpenSSL use softhsm2 engine\n- ossl_conf = self.TestFile('340_openssl.conf')\n+ ossl_conf = self.TestFile('fit/openssl.conf')\n with unittest.mock.patch.dict('os.environ',\n {'OPENSSL_CONF': ossl_conf,\n 'SOFTHSM2_CONF': softhsm2_conf}):\n@@ -8114,7 +8114,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n \n prefix = \"testFitSignPKCS11Object.\"\n # Configure SoftHSMv2\n- data = tools.read_file(self.TestFile('340_softhsm2.conf'))\n+ data = tools.read_file(self.TestFile('fit/softhsm2.conf'))\n softhsm2_conf = self._MakeInputFile(f'{prefix}softhsm2.conf', data)\n softhsm2_tokens_dir = self._MakeInputDir(f'{prefix}softhsm2.tokens')\n \n@@ -8147,7 +8147,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n # Make OpenSSL use softhsm2 engine and configure PIN for token\n # The PIN is incorrect on purpose, the correct one will be passed by\n # MKIMAGE_SIGN_PIN\n- ossl_conf = self.TestFile('340_openssl.conf')\n+ ossl_conf = self.TestFile('fit/openssl.conf')\n with unittest.mock.patch.dict('os.environ',\n {'OPENSSL_CONF': ossl_conf,\n 'SOFTHSM2_CONF': softhsm2_conf,\n@@ -8204,9 +8204,9 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n 'default-dt': 'test-fdt1',\n 'atf-bl31-path': 'bl31.elf',\n }\n- data = tools.read_file(self.TestFile(\"340_rsa2048.key\"))\n+ data = tools.read_file(self.TestFile(\"fit/rsa2048.key\"))\n self._MakeInputFile(\"keys1/rsa2048.key\", data)\n- data = tools.read_file(self.TestFile(\"340_rsa2048.key\"))\n+ data = tools.read_file(self.TestFile(\"fit/rsa2048.key\"))\n self._MakeInputFile(\"keys2/conf-rsa2048.key\", data)\n \n test_subdir = os.path.join(self._indir, TEST_FDT_SUBDIR)\n@@ -8257,7 +8257,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n \n def testSimpleFitEncryptedData(self):\n \"\"\"Test an image with a FIT containing data to be encrypted\"\"\"\n- data = tools.read_file(self.TestFile(\"aes256.bin\"))\n+ data = tools.read_file(self.TestFile(\"fit/aes256.bin\"))\n self._MakeInputFile(\"keys/aes256.bin\", data)\n \n keys_subdir = os.path.join(self._indir, \"keys\")\n@@ -8277,7 +8277,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n \n # Retrieve the key name from the FIT removing any null byte\n key_name = fit.GetProps(subnode)['key-name-hint'].bytes.replace(b'\\x00', b'')\n- with open(self.TestFile(key_name.decode('ascii') + '.bin'), 'rb') as file:\n+ with open(self.TestFile('fit/' + key_name.decode('ascii') + '.bin'), 'rb') as file:\n key = file.read()\n iv = fit.GetProps(subnode)['iv'].bytes.hex()\n enc_data = fit.GetProps(node)['data'].bytes\ndiff --git a/tools/binman/test/Makefile b/tools/binman/test/Makefile\nindex d5e4c0f556a..6b42db6559f 100644\n--- a/tools/binman/test/Makefile\n+++ b/tools/binman/test/Makefile\n@@ -85,7 +85,7 @@ blob_syms: blob_syms.c\n elf_sections: CFLAGS += $(LDS_EFL_SECTIONS)\n elf_sections: elf_sections.c\n \n-dummy-rsa-engine.so: dummy-rsa-engine.c\n+dummy-rsa-engine.so: $(SRC)fit/dummy-rsa-engine.c\n \t$(CC) -fPIC -shared -lcrypto -lssl -o $@ $<\n \n clean:\ndiff --git a/tools/binman/test/aes256.bin b/tools/binman/test/fit/aes256.bin\nsimilarity index 100%\nrename from tools/binman/test/aes256.bin\nrename to tools/binman/test/fit/aes256.bin\ndiff --git a/tools/binman/test/dummy-rsa-engine.c b/tools/binman/test/fit/dummy-rsa-engine.c\nsimilarity index 100%\nrename from tools/binman/test/dummy-rsa-engine.c\nrename to tools/binman/test/fit/dummy-rsa-engine.c\ndiff --git a/tools/binman/test/340_dummy-rsa4096.crt b/tools/binman/test/fit/dummy-rsa4096.crt\nsimilarity index 100%\nrename from tools/binman/test/340_dummy-rsa4096.crt\nrename to tools/binman/test/fit/dummy-rsa4096.crt\ndiff --git a/tools/binman/test/340_openssl.conf b/tools/binman/test/fit/openssl.conf\nsimilarity index 100%\nrename from tools/binman/test/340_openssl.conf\nrename to tools/binman/test/fit/openssl.conf\ndiff --git a/tools/binman/test/340_rsa2048.key b/tools/binman/test/fit/rsa2048.key\nsimilarity index 100%\nrename from tools/binman/test/340_rsa2048.key\nrename to tools/binman/test/fit/rsa2048.key\ndiff --git a/tools/binman/test/340_softhsm2.conf b/tools/binman/test/fit/softhsm2.conf\nsimilarity index 100%\nrename from tools/binman/test/340_softhsm2.conf\nrename to tools/binman/test/fit/softhsm2.conf\n", "prefixes": [ "v2", "18/23" ] }