From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F33BEEB64DC for ; Thu, 15 Jun 2023 09:46:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243773AbjFOJqK (ORCPT ); Thu, 15 Jun 2023 05:46:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238768AbjFOJqI (ORCPT ); Thu, 15 Jun 2023 05:46:08 -0400 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E71A1A3; Thu, 15 Jun 2023 02:46:06 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0VlA7p6M_1686822362; Received: from 30.240.108.67(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0VlA7p6M_1686822362) by smtp.aliyun-inc.com; Thu, 15 Jun 2023 17:46:03 +0800 Message-ID: Date: Thu, 15 Jun 2023 17:46:00 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH] sign-file: simplify main function implementation Content-Language: en-US To: Jarkko Sakkinen , David Howells , David Woodhouse , keyrings@vger.kernel.org, linux-kernel@vger.kernel.org References: <20230525084343.56824-1-tianjia.zhang@linux.alibaba.com> From: Tianjia Zhang In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jarkko, On 6/10/23 1:38 AM, Jarkko Sakkinen wrote: > On Thu May 25, 2023 at 11:43 AM EEST, Tianjia Zhang wrote: >> use_signed_attrs is an unnecessary variable, deleting this variable >> can simplify the code. >> >> Signed-off-by: Tianjia Zhang >> --- >> scripts/sign-file.c | 12 ++---------- >> 1 file changed, 2 insertions(+), 10 deletions(-) >> >> diff --git a/scripts/sign-file.c b/scripts/sign-file.c >> index 94267cf72197..377d586762f9 100644 >> --- a/scripts/sign-file.c >> +++ b/scripts/sign-file.c >> @@ -224,7 +224,6 @@ int main(int argc, char **argv) >> bool raw_sig = false; >> unsigned char buf[4096]; >> unsigned long module_size, sig_size; >> - unsigned int use_signed_attrs; >> const EVP_MD *digest_algo; >> EVP_PKEY *private_key; >> #ifndef USE_PKCS7 >> @@ -242,12 +241,6 @@ int main(int argc, char **argv) >> >> key_pass = getenv("KBUILD_SIGN_PIN"); >> >> -#ifndef USE_PKCS7 >> - use_signed_attrs = CMS_NOATTR; >> -#else >> - use_signed_attrs = PKCS7_NOATTR; >> -#endif >> - >> do { >> opt = getopt(argc, argv, "sdpk"); >> switch (opt) { >> @@ -340,8 +333,7 @@ int main(int argc, char **argv) >> >> ERR(!CMS_add1_signer(cms, x509, private_key, digest_algo, >> CMS_NOCERTS | CMS_BINARY | >> - CMS_NOSMIMECAP | use_keyid | >> - use_signed_attrs), >> + CMS_NOSMIMECAP | CMS_NOATTR | use_keyid), >> "CMS_add1_signer"); >> ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0, >> "CMS_final"); >> @@ -349,7 +341,7 @@ int main(int argc, char **argv) >> #else >> pkcs7 = PKCS7_sign(x509, private_key, NULL, bm, >> PKCS7_NOCERTS | PKCS7_BINARY | >> - PKCS7_DETACHED | use_signed_attrs); >> + PKCS7_DETACHED | PKCS7_NOATTR); >> ERR(!pkcs7, "PKCS7_sign"); >> #endif >> >> -- >> 2.24.3 (Apple Git-128) > > I'm sorry but I don't see how this makes our lives better. > > If, however, this was part of a larger patch, it might make sense, if > there was a real functional change concerning the same code blocks. > > BR, Jarkko As you might expect, this is a stand-alone patch and there are no other changes attached to it. Best regards, Tianjia