Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp672205rwd; Thu, 25 May 2023 02:08:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6iIHRJbSBZvTxa7mO1XNAmfMB2oQF5uNKcSWCm2gmhLJvR9ZgODdgFbZZLQ7kBSZ6om9uv X-Received: by 2002:a17:903:230f:b0:1af:a03:8d82 with SMTP id d15-20020a170903230f00b001af0a038d82mr1034216plh.57.1685005735525; Thu, 25 May 2023 02:08:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685005735; cv=none; d=google.com; s=arc-20160816; b=rahSsyW2XjlmI5dN3iaRvzQuNIzv2dHeS/1w5BXmtrcPdgbETkOZAwBXVkQaBKoovp Mo2A92UBI8DTAZOl2dwUFivS0/99qbxWv/I4WKiv9PyzMIU5md98+bVaOnudcbLgZ0DL En/9RvpO4GEWgPskSjtynnMztiap0O6kbX8mzCLTK0GqmLIOgsEVf7OMjlpunNs8iBeG M2/JPNSMhqWtwJD3Qt3LZYc5S2jx32j7UxNs05ypjWCq5Zx/dFRyBCQeuBefJCa56N7j XIVcjp76buTSQ4LNXf7UtaJ3fxpi6u4La2tHcwEw922UnBTnd6Xw6J0wXevLauR+cdxk QCwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Qyc1qTIrnqovT1nlClcxfHGTg8JyzRoAXHUMtmq1mDk=; b=n1OT5qnTeiupxAxeE6PegOq74osYEALCG8qMkalrKlGDWcsgqoIkqh2jsSNm1qQoZI 9MKjpFtUtg3SnnsarU34jIs5IOzDcAGfepScmWWaW8904mzvsbyabS8ojlKFWyAc/H8d 9alPC6VKCbtG8UchgdhlRfJJ/W7nnZIDy9W22A5iKPJQ5Ib+2oPvC/++zgz4tO7HufA+ NyzAYBIz8utijqpCf1oA0MOuK3PyfdIUPMlI6wtgIOKS1nrDryXvIKvYLguBF14BEsdD aMRo4I6pIt9wD57jVwk8C46bAxN3QLs8G4ET8fFJOURRexN32TTSTD7yyRSa2ECZzNwG flgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q23-20020a170902edd700b001ac7ea55768si979175plk.499.2023.05.25.02.08.40; Thu, 25 May 2023 02:08:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240345AbjEYInw (ORCPT + 99 others); Thu, 25 May 2023 04:43:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240330AbjEYInt (ORCPT ); Thu, 25 May 2023 04:43:49 -0400 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CEE4195; Thu, 25 May 2023 01:43:47 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VjRaM-i_1685004224; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0VjRaM-i_1685004224) by smtp.aliyun-inc.com; Thu, 25 May 2023 16:43:44 +0800 From: Tianjia Zhang To: Jarkko Sakkinen , David Howells , David Woodhouse , keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tianjia Zhang Subject: [PATCH] sign-file: simplify main function implementation Date: Thu, 25 May 2023 16:43:43 +0800 Message-Id: <20230525084343.56824-1-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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)