Messages in this thread Patch in this message | | | From | Shreenidhi Shedi <> | Subject | [PATCH v2 2/6] sign-file: move file signing logic to its own function | Date | Tue, 14 Feb 2023 00:20:14 +0530 |
| |
Keep the main function bare minimal and do less in main function.
Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com> --- scripts/sign-file.c | 69 +++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 30 deletions(-)
diff --git a/scripts/sign-file.c b/scripts/sign-file.c index cf3acbb13013..4732201feb96 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -230,7 +230,7 @@ struct cmd_opts { #endif }; -void parse_args(int argc, char **argv, struct cmd_opts *opts) +static void parse_args(int argc, char **argv, struct cmd_opts *opts) { struct option cmd_options[] = { /* These options set a flag. */ @@ -315,10 +315,10 @@ void parse_args(int argc, char **argv, struct cmd_opts *opts) } while (opt != -1); } -int main(int argc, char **argv) +int sign_file(int argc, char **argv, struct cmd_opts *opts) { struct module_signature sig_info = { .id_type = PKEY_ID_PKCS7 }; - unsigned char buf[4096]; + unsigned char buf[4096] = {0}; unsigned long module_size, sig_size; unsigned int use_signed_attrs; const EVP_MD *digest_algo; @@ -331,36 +331,20 @@ int main(int argc, char **argv) X509 *x509; BIO *bd, *bm; int i, n; - struct cmd_opts opts = {0}; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); - ERR_clear_error(); - - key_pass = getenv("KBUILD_SIGN_PIN"); + char *hash_algo = opts->hash_algo; + char *dest_name = opts->dest_name; + char *private_key_name = opts->private_key_name; + char *raw_sig_name = opts->raw_sig_name; + char *x509_name = opts->x509_name; + char *module_name = opts->module_name; + bool save_sig = opts->save_sig; + bool replace_orig = opts->replace_orig; + bool raw_sig = opts->raw_sig; + bool sign_only = opts->sign_only; #ifndef USE_PKCS7 - use_signed_attrs = CMS_NOATTR; -#else - use_signed_attrs = PKCS7_NOATTR; -#endif - parse_args(argc, argv, &opts); - argc -= optind; - argv += optind; - - char *hash_algo = opts.hash_algo; - char *dest_name = opts.dest_name; - char *private_key_name = opts.private_key_name; - char *raw_sig_name = opts.raw_sig_name; - char *x509_name = opts.x509_name; - char *module_name = opts.module_name; - bool save_sig = opts.save_sig; - bool replace_orig = opts.replace_orig; - bool raw_sig = opts.raw_sig; - bool sign_only = opts.sign_only; - -#ifndef USE_PKCS7 - unsigned int use_keyid = opts.use_keyid; + unsigned int use_keyid = opts->use_keyid; #endif if (!argv[0] || argc != 1) @@ -381,6 +365,19 @@ int main(int argc, char **argv) exit(3); } #endif + + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + ERR_clear_error(); + + key_pass = getenv("KBUILD_SIGN_PIN"); + +#ifndef USE_PKCS7 + use_signed_attrs = CMS_NOATTR; +#else + use_signed_attrs = PKCS7_NOATTR; +#endif + /* Open the module file */ bm = BIO_new_file(module_name, "rb"); ERR(!bm, "%s", module_name); @@ -492,3 +489,15 @@ int main(int argc, char **argv) return 0; } + +int main(int argc, char **argv) +{ + struct cmd_opts opts = {0}; + + parse_args(argc, argv, &opts); + + argc -= optind; + argv += optind; + + return sign_file(argc, argv, &opts); +} -- 2.39.1
| |