From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "Tianjia Zhang" <tianjia.zhang@linux.alibaba.com>,
"David Howells" <dhowells@redhat.com>,
"David Woodhouse" <dwmw2@infradead.org>,
<keyrings@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] sign-file: simplify main function implementation
Date: Fri, 09 Jun 2023 20:38:07 +0300 [thread overview]
Message-ID: <CT8AWM6PDMMX.RAF5C6RS1P95@suppilovahvero> (raw)
In-Reply-To: <20230525084343.56824-1-tianjia.zhang@linux.alibaba.com>
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 <tianjia.zhang@linux.alibaba.com>
> ---
> 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
next prev parent reply other threads:[~2023-06-09 17:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-25 8:43 [PATCH] sign-file: simplify main function implementation Tianjia Zhang
2023-06-09 17:38 ` Jarkko Sakkinen [this message]
2023-06-15 9:46 ` Tianjia Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CT8AWM6PDMMX.RAF5C6RS1P95@suppilovahvero \
--to=jarkko@kernel.org \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tianjia.zhang@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).