From nobody Mon Feb 9 00:25:46 2026 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 32E33C7618A for ; Mon, 20 Mar 2023 18:51:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229983AbjCTSvO (ORCPT ); Mon, 20 Mar 2023 14:51:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229833AbjCTSud (ORCPT ); Mon, 20 Mar 2023 14:50:33 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B45222A6E4 for ; Mon, 20 Mar 2023 11:43:54 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id mp3-20020a17090b190300b0023fcc8ce113so2606909pjb.4 for ; Mon, 20 Mar 2023 11:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679337831; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i/r1WlIiwVQzbXgHldnF4Wyr/f+kJm7/RhfD8t1T97c=; b=mvbc+KbAMV/2CYl45Ep+u6Q2GvoOIngEB6TEM6uObxZ1l9LhmFGS/vYhcWCFXB+62a 1H9fbnKZMWNAFarKloOjJQ/EuIA2BPO+8woH/1JMIuS6+w2b2P8fiMh0ISgh+xH42DYI WvySWaRxxzeHv2mFhcB95+MjSKNembpqTqbcR5YNeSPzlMs5bqYAvYXMIDVSFtQU3hYT NXaBHOTW1m8LyCiqSe+wTpD9mi0lLzgVlmFxiGkac81vrngzHl/RismDbLMFz3apDuzb pMnpfVvYces3gYbBX7xt0O6sVXg67e8vyaWKTcxgtiO52e8TUzmgQeDokGpVRhN8gJ+r Hpzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679337831; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i/r1WlIiwVQzbXgHldnF4Wyr/f+kJm7/RhfD8t1T97c=; b=o4+W/I9QM0ZVo8cwVnzu/+/s70PmkcsY7BWQaFVTe58LKiitLPNxl5jLr8y6yhjK6V dsk5OFm/W2w4NVxnWYMzf1k1vRd6x0svtPSW4T3wnoJKEu9iFljVgFe5lVKzvxhvD4Lj DqHrj9EybDEntMt5YjGXHGZZz5IWvIfCdLjzglRGvHPUACAYCXjrWTv9gONzpOWNjV+g SClvA4O8h866lo4yWOsSEX0NFqbEpdiLU3+moR/+uC2osKk6l+6FdNfUDXgQtvTVW07M g/D+U6VhdTuOKybm0UXDUSd7BvWxG6ky6e568PcLfAQyB7c9uatOV8Qx12c7Rpc8dVbC MKlw== X-Gm-Message-State: AO0yUKXOhZN9UwGHT+JEXfRakONPOJTLmOzl/Wn5/2gVBOrUpKU7GsA5 cK0qk2L9NmPa2Gvos7NwKOE= X-Google-Smtp-Source: AK7set+gGl1cK14wvEC4/nuXvETShSMERUnMhwWKDTROGbPtEbeARpIrfwzUGma7QwDeqJwB9hDZwg== X-Received: by 2002:a05:6a20:8407:b0:d5:ac2b:7e01 with SMTP id c7-20020a056a20840700b000d5ac2b7e01mr24438707pzd.34.1679337831136; Mon, 20 Mar 2023 11:43:51 -0700 (PDT) Received: from f37.eng.vmware.com ([66.170.99.1]) by smtp.googlemail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm6671755pfb.214.2023.03.20.11.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 11:43:50 -0700 (PDT) From: Shreenidhi Shedi X-Google-Original-From: Shreenidhi Shedi To: gregkh@linuxfoundation.org, dhowells@redhat.com, dwmw2@infradead.org Cc: yesshedi@gmail.com, linux-kernel@vger.kernel.org, sshedi@vmware.com Subject: [PATCH v5 1/7] sign-file: refactor argument parsing logic - 1 Date: Tue, 21 Mar 2023 00:13:39 +0530 Message-Id: <20230320184345.80166-2-sshedi@vmware.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320184345.80166-1-sshedi@vmware.com> References: <20230320184345.80166-1-sshedi@vmware.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Shreenidhi Shedi - Use getopt_long_only for parsing input args - Use more easy to remember command line argument names Signed-off-by: Shreenidhi Shedi --- scripts/sign-file.c | 97 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 78 insertions(+), 19 deletions(-) diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 598ef5465f82..94228865b6cc 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -213,15 +213,77 @@ static X509 *read_x509(const char *x509_name) return x509; } =20 +struct cmd_opts { + char *raw_sig_name; + bool save_sig; + bool replace_orig; + bool raw_sig; + bool sign_only; +#ifndef USE_PKCS7 + unsigned int use_keyid; +#endif +}; + +static void parse_args(int argc, char **argv, struct cmd_opts *opts) +{ + struct option cmd_options[] =3D { + {"rawsig", required_argument, 0, 's'}, + {"savesig", no_argument, 0, 'p'}, + {"signonly", no_argument, 0, 'd'}, +#ifndef USE_PKCS7 + {"usekeyid", no_argument, 0, 'k'}, +#endif + {0, 0, 0, 0} + }; + + int opt; + int opt_index =3D 0; + + do { +#ifndef USE_PKCS7 + opt =3D getopt_long_only(argc, argv, "pds:", + cmd_options, &opt_index); +#else + opt =3D getopt_long_only(argc, argv, "pdks:", + cmd_options, &opt_index); +#endif + switch (opt) { + case 's': + opts->raw_sig =3D true; + opts->raw_sig_name =3D optarg; + break; + + case 'p': + opts->save_sig =3D true; + break; + + case 'd': + opts->sign_only =3D true; + opts->save_sig =3D true; + break; + +#ifndef USE_PKCS7 + case 'k': + opts->use_keyid =3D CMS_USE_KEYID; + break; +#endif + + case -1: + break; + + default: + format(); + break; + } + } while (opt !=3D -1); +} + int main(int argc, char **argv) { struct module_signature sig_info =3D { .id_type =3D PKEY_ID_PKCS7 }; char *hash_algo =3D NULL; - char *private_key_name =3D NULL, *raw_sig_name =3D NULL; + char *private_key_name =3D NULL; char *x509_name, *module_name, *dest_name; - bool save_sig =3D false, replace_orig; - bool sign_only =3D false; - bool raw_sig =3D false; unsigned char buf[4096]; unsigned long module_size, sig_size; unsigned int use_signed_attrs; @@ -229,13 +291,14 @@ int main(int argc, char **argv) EVP_PKEY *private_key; #ifndef USE_PKCS7 CMS_ContentInfo *cms =3D NULL; - unsigned int use_keyid =3D 0; #else PKCS7 *pkcs7 =3D NULL; #endif X509 *x509; BIO *bd, *bm; - int opt, n; + int n; + struct cmd_opts opts =3D {}; + OpenSSL_add_all_algorithms(); ERR_load_crypto_strings(); ERR_clear_error(); @@ -247,23 +310,19 @@ int main(int argc, char **argv) #else use_signed_attrs =3D PKCS7_NOATTR; #endif + parse_args(argc, argv, &opts); + argc -=3D optind; + argv +=3D optind; =20 - do { - opt =3D getopt(argc, argv, "sdpk"); - switch (opt) { - case 's': raw_sig =3D true; break; - case 'p': save_sig =3D true; break; - case 'd': sign_only =3D true; save_sig =3D true; break; + const char *raw_sig_name =3D opts.raw_sig_name; + const bool save_sig =3D opts.save_sig; + const bool raw_sig =3D opts.raw_sig; + const bool sign_only =3D opts.sign_only; + bool replace_orig =3D opts.replace_orig; #ifndef USE_PKCS7 - case 'k': use_keyid =3D CMS_USE_KEYID; break; + const unsigned int use_keyid =3D opts.use_keyid; #endif - case -1: break; - default: format(); - } - } while (opt !=3D -1); =20 - argc -=3D optind; - argv +=3D optind; if (argc < 4 || argc > 5) format(); =20 --=20 2.39.2