{"id":1745906,"url":"http://patchwork.ozlabs.org/api/patches/1745906/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-42-pali@kernel.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","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":"<20230221201925.9644-42-pali@kernel.org>","list_archive_url":null,"date":"2023-02-21T20:19:07","name":"[RFC,u-boot-mvebu,41/59] tools: kwbimage: Simplify add_secure_header_v1()","commit_ref":"dd13ac5495792325793ffcc381187afa3ba89f01","pull_url":null,"state":"accepted","archived":false,"hash":"81358ba4a14173d5bef7f978eec671e2d8cbcb58","submitter":{"id":78810,"url":"http://patchwork.ozlabs.org/api/people/78810/?format=json","name":"Pali Rohár","email":"pali@kernel.org"},"delegate":{"id":1696,"url":"http://patchwork.ozlabs.org/api/users/1696/?format=json","username":"stroese","first_name":"Stefan","last_name":"Roese","email":"sr@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-42-pali@kernel.org/mbox/","series":[{"id":343058,"url":"http://patchwork.ozlabs.org/api/series/343058/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=343058","date":"2023-02-21T20:18:27","name":"arm: mvebu: Various fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/343058/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1745906/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1745906/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["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=)","legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=U234F+R4;\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.b=\"U234F+R4\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org","phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.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 server-signature ECDSA (P-384))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4PLrbV5XdNz23j7\n\tfor ; Wed, 22 Feb 2023 07:33:42 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 581EC85B9A;\n\tTue, 21 Feb 2023 21:24:48 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id B1D8685B5E; Tue, 21 Feb 2023 21:23:58 +0100 (CET)","from dfw.source.kernel.org (dfw.source.kernel.org\n [IPv6:2604:1380:4641:c500::1])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 3A42285AD1\n for ; Tue, 21 Feb 2023 21:22:44 +0100 (CET)","from smtp.kernel.org (relay.kernel.org [52.25.139.140])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by dfw.source.kernel.org (Postfix) with ESMTPS id 3A540611EE;\n Tue, 21 Feb 2023 20:22:35 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id E3D3EC4339B;\n Tue, 21 Feb 2023 20:22:34 +0000 (UTC)","by pali.im (Postfix)\n id A1104708; Tue, 21 Feb 2023 21:22:34 +0100 (CET)"],"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,SPF_HELO_NONE,\n SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1677010955;\n bh=U23J/oIO2uHrEz9WM5Tj4Bx1mX8g8Qg0s3jCog67tp0=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=U234F+R4fuWThg3oFNogli2lKT5q5W2cG1hGzeJ96X4kXonriVoC9eotJJrgQhC8T\n jTbueyyuNLPumgr5RqZ1o6Is8mDI+bLSL88hAsSQCFdxLMcWn77OIaJgW9ZCiWquKN\n arzJ0skV6UPP3VwUPdTcHu8HHzQj0v+ionW4DGZCAhx82n7Q0bNU41HSDiHuXX+2b4\n g3kcf/AixoNQheXmUZndNtHWsYedWPzs0f+Wtr1COsv6Xjc8n1JiOgcsYCTk8yRAh0\n RBMFqqGrLXiqSAW6RBQ2PuDapa4bhG/6zrqrs36fbCVCupK5oGAV1/fDj1tEJ8yAhZ\n jWpvBT2Olv+cQ==","From":"=?utf-8?q?Pali_Roh=C3=A1r?= ","To":"u-boot@lists.denx.de","Cc":"Stefan Roese , Tony Dinh ,\n Josua Mayer ","Subject":"[PATCH RFC u-boot-mvebu 41/59] tools: kwbimage: Simplify\n add_secure_header_v1()","Date":"Tue, 21 Feb 2023 21:19:07 +0100","Message-Id":"<20230221201925.9644-42-pali@kernel.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20230221201925.9644-1-pali@kernel.org>","References":"<20230221201925.9644-1-pali@kernel.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","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"},"content":"To make add_secure_header_v1() function more readable, call it directly\nwith arguments: header pointer with header size and data image pointer with\ndata image size. No functional change.\n\nSigned-off-by: Pali Rohár \n---\n tools/kwbimage.c | 15 +++++----------\n 1 file changed, 5 insertions(+), 10 deletions(-)","diff":"diff --git a/tools/kwbimage.c b/tools/kwbimage.c\nindex 5f62ed159c4b..857af6a438a4 100644\n--- a/tools/kwbimage.c\n+++ b/tools/kwbimage.c\n@@ -1322,16 +1322,14 @@ static int kwb_sign_csk_with_kak(struct image_tool_params *params,\n \treturn 0;\n }\n \n-static int add_secure_header_v1(struct image_tool_params *params, uint8_t *ptr,\n-\t\t\t\tint payloadsz, size_t headersz, uint8_t *image,\n+static int add_secure_header_v1(struct image_tool_params *params, uint8_t *image_ptr,\n+\t\t\t\tsize_t image_size, uint8_t *header_ptr, size_t headersz,\n \t\t\t\tstruct secure_hdr_v1 *secure_hdr)\n {\n \tstruct image_cfg_element *e_jtagdelay;\n \tstruct image_cfg_element *e_boxid;\n \tstruct image_cfg_element *e_flashid;\n \tRSA *csk = NULL;\n-\tunsigned char *image_ptr;\n-\tsize_t image_size;\n \tstruct sig_v1 tmp_sig;\n \tbool specialized_img = image_get_spezialized_img();\n \n@@ -1357,14 +1355,11 @@ static int add_secure_header_v1(struct image_tool_params *params, uint8_t *ptr,\n \tif (kwb_sign_csk_with_kak(params, secure_hdr, csk))\n \t\treturn 1;\n \n-\timage_ptr = ptr + headersz;\n-\timage_size = payloadsz - headersz;\n-\n \tif (kwb_sign_and_verify(csk, image_ptr, image_size,\n \t\t\t\t&secure_hdr->imgsig, \"image\") < 0)\n \t\treturn 1;\n \n-\tif (kwb_sign_and_verify(csk, image, headersz, &tmp_sig, \"header\") < 0)\n+\tif (kwb_sign_and_verify(csk, header_ptr, headersz, &tmp_sig, \"header\") < 0)\n \t\treturn 1;\n \n \tsecure_hdr->hdrsig = tmp_sig;\n@@ -1533,8 +1528,8 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,\n \t\t\t\t\t &datai, delay);\n \t}\n \n-\tif (secure_hdr && add_secure_header_v1(params, ptr, payloadsz + headersz,\n-\t\t\t\t\t headersz, image, secure_hdr))\n+\tif (secure_hdr && add_secure_header_v1(params, ptr + headersz, payloadsz,\n+\t\t\t\t\t image, headersz, secure_hdr))\n \t\treturn NULL;\n \n \t*imagesz = headersz;\n","prefixes":["RFC","u-boot-mvebu","41/59"]}