refactor file signing program
Subsystems (2)
v9 cover refactor file signing program
This patch series refactors the sign-file program.
Brief of changes in this patch series:
- Improve argument parsing logic.
- Add few more easy to remember arguments.
- Add support to sign bunch of modules at once.
- Improve the help message with examples.
- Few trivial checkpatch reported issue fixes.
Version 9 changes:
- Dropped kbuild related changes, thanks to Masahiro Yamada for all the inputs and advices.
Version 8 changes:
- Addressed comments from Masahiro Yamada
- Fix the bisect'ability error in patch 2.
- Fix missed out modules_sign_only issue.
Version 7 changes:
- Change Makefile.modinst and divide the tasks further
- Don't do everything from one place.
- This whole thing is done to facilitate bulk signing of modules
- Greg suggsted this idea here:
https://lore.kernel.org/all/2023060155-mustard-mating-32b7@gregkh/
- Thanks for the inputs Greg
- v7-0008-kbuild-modinst-do-modules_install-step-by-step.patch is fairly big and I'm sorry about it. I created all patches considering build stability in mind, so this can't be broken into pieces else in the intermediate commit build will break.
Version 6 changes:
- Fix commit messages as suggested by Greg and David.
Version 5 changes:
- Addressed review comments from David Howells.
- Fragmented the patches into further small units.
Link:
v4: https://lore.kernel.org/all/[email protected]/
Version 1 - Version 4 changes:
Did some back and forth changes. Getting familiar with patch submission process, nothing significant happened.
Links:
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]
Shreenidhi Shedi (7):
sign-file: use getopt_long_only for parsing input args
sign-file: inntroduce few new flags to make argument processing easy.
sign-file: move file signing logic to its own function
sign-file: add support to sign modules in bulk
sign-file: improve help message
sign-file: use const with a global string constant
sign-file: fix do while styling issue
scripts/Makefile.modinst | 4 +- scripts/sign-file.c | 292 ++++++++++++++++++++++++++++----------- 2 files changed, 212 insertions(+), 84 deletions(-)
--
2.41.0
PATCH v9 1/7 sign-file: use getopt_long_only for parsing input args
- getopt_long_only gives an option to use long names for options, so using it here to make the app usage easier.
- Use more easy to remember command line argument names
- Introduce cmd_opts structure to ease the handling of command line args
--- scripts/sign-file.c | 97 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 78 insertions(+), 19 deletions(-)
scripts/sign-file.c +78 -19
@@ -213,15 +213,77 @@ static X509 *read_x509(const char *x509_name)return x509; } +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[] = { + {"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 =0 ; + +do { +#ifndef USE_PKCS7 + opt =getopt_long_only (argc, argv,"pds:" , + cmd_options, &opt_index); +#else + opt =getopt_long_only (argc, argv,"pdks:" , + cmd_options, &opt_index); +#endif +switch (opt) { +case 's' : + opts->raw_sig = true; + opts->raw_sig_name = optarg; +break ; + +case 'p' : + opts->save_sig = true; +break ; + +case 'd' : + opts->sign_only = true; + opts->save_sig = true; +break ; + +#ifndef USE_PKCS7 +case 'k' : + opts->use_keyid =CMS_USE_KEYID ; +break ; +#endif + +case -1 : +break ; + +default : +format (); +break ; + } + }while (opt !=-1 ); +} +int main (int argc,char **argv) {struct module_signature sig_info = { .id_type =PKEY_ID_PKCS7 };char *hash_algo =NULL ; -char *private_key_name =NULL , *raw_sig_name =NULL ; +char *private_key_name =NULL ;char *x509_name, *module_name, *dest_name; -bool save_sig = false, replace_orig; -bool sign_only = false; -bool raw_sig = 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 =NULL ; -unsigned int use_keyid =0 ;#else PKCS7 *pkcs7 =NULL ;#endif X509 *x509;BIO *bd, *bm; -int opt, n; +int n; +struct cmd_opts opts = {}; +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 =PKCS7_NOATTR ;#endif +parse_args (argc, argv, &opts); + argc -= optind; + argv += optind; -do { - opt =getopt (argc, argv,"sdpk" ); -switch (opt) { -case 's' : raw_sig = true;break ; -case 'p' : save_sig = true;break ; -case 'd' : sign_only = true; save_sig = true;break ; +const char *raw_sig_name = opts.raw_sig_name; +const bool save_sig = opts.save_sig; +const bool raw_sig = opts.raw_sig; +const bool sign_only = opts.sign_only; +bool replace_orig = opts.replace_orig;#ifndef USE_PKCS7 -case 'k' : use_keyid =CMS_USE_KEYID ;break ; +const unsigned int use_keyid = opts.use_keyid;#endif -case -1 :break ; -default :format (); - } - }while (opt !=-1 ); - argc -= optind; - argv += optind;if (argc <4 || argc >5 )format ();
Signature · 1 line
2.41.0
Re: [PATCH v9 1/7] sign-file: use getopt_long_only for parsing input args
Quoted 6 lines · Shreenidhi Shedi
-
getopt_long_onlygives an option to use long names for options, so using it here to make the app usage easier.- Use more easy to remember command line argument names
- Introduce
cmd_optsstructure to ease the handling of command line args
When you have to list a number of different things that you did in a single patch, that usually means this needs to be split up into multiple changes.
Please do so here, you are converting to a different api (getopt_long) and adding new arguments (with no documentation) at the same time, which means this is an almost impossible change to review easily. Would you want to review this?
thanks,
greg k-h
PATCH v9 2/7 sign-file: inntroduce few new flags to make argument processing easy.
In reply to Shreenidhi Shedi- Add some more options like help, x509, hashalgo to command line args
- This makes it easy to handle and use command line args wherever needed
--- scripts/Makefile.modinst | 4 ++- scripts/sign-file.c | 63 ++++++++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 19 deletions(-)
scripts/Makefile.modinst +3 -1
@@ -72,7 +72,9 @@ else sig-key := $(CONFIG_MODULE_SIG_KEY) endif quiet_cmd_sign = SIGN $@ - cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) "$(sig-key)" certs/signing_key.x509 $@ \ + cmd_sign = scripts/sign-file -a "$(CONFIG_MODULE_SIG_HASH)" \ + -i "$(sig-key)" \ + -x certs/signing_key.x509 $@ \ $(if $(KBUILD_EXTMOD),|| true) else quiet_cmd_sign :=
scripts/sign-file.c +45 -18
114 lines not on this page · raw message
Signature · 1 line
2.41.0
Re: [PATCH v9 2/7] sign-file: inntroduce few new flags to make argument processing easy.
Quoted 2 lines · Shreenidhi Shedi
- Add some more options like help, x509, hashalgo to command line args
- This makes it easy to handle and use command line args wherever needed
I do not understand this second line. Please read the kernel documentation for a great summary of how to write good kernel changelog text messages. It is usually the most difficult portion of writing the patch.
thanks,
greg k-h
Re: [PATCH v9 2/7] sign-file: inntroduce few new flags to make argument processing easy.
In reply to Shreenidhi ShediQuoted 1 line · Shreenidhi Shedi
- Add some more options like help, x509, hashalgo to command line args
What do these options do? Why multiple new features in one change? Where are any of these documented?
thanks,
greg k-h
PATCH v9 3/7 sign-file: move file signing logic to its own function
In reply to Shreenidhi ShediKeep the main function bare minimal and do less in main function. This patch is pre-work for bulk module signing support.
--- scripts/sign-file.c | 115 +++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 61 deletions(-)
scripts/sign-file.c +54 -61
@@ -313,10 +313,10 @@ static void parse_args(int argc, char **argv, struct cmd_opts *opts) }while (opt !=-1 ); } -int main (int argc,char **argv) +static int sign_single_file (struct cmd_opts *opts) {struct module_signature sig_info = { .id_type =PKEY_ID_PKCS7 }; -unsigned char buf[4096 ]; +unsigned char buf[4096 ] = {};unsigned long module_size, sig_size;unsigned int use_signed_attrs;const EVP_MD *digest_algo;
@@ -329,11 +329,6 @@ int main(int argc, char **argv)X509 *x509;BIO *bd, *bm;int n; -struct cmd_opts opts = {}; - -OpenSSL_add_all_algorithms (); -ERR_load_crypto_strings (); -ERR_clear_error (); key_pass =getenv ("KBUILD_SIGN_PIN" );
@@ -342,34 +337,6 @@ int main(int argc, char **argv)#else use_signed_attrs =PKCS7_NOATTR ;#endif -parse_args (argc, argv, &opts); - argc -= optind; - argv += optind; - -const char *raw_sig_name = opts.raw_sig_name; -const char *hash_algo = opts.hash_algo; -const char *private_key_name = opts.private_key_name; -const char *x509_name = opts.x509_name; -const char *module_name = opts.module_name; -const bool save_sig = opts.save_sig; -const bool raw_sig = opts.raw_sig; -const bool sign_only = opts.sign_only; -bool replace_orig = opts.replace_orig; -char *dest_name = opts.dest_name; -#ifndef USE_PKCS7 -const unsigned int use_keyid = opts.use_keyid; -#endif - -if (!argv[0 ] || argc !=1 ) -format (); - -if (dest_name &&strcmp (argv[0 ], dest_name)) { - replace_orig = false; - }else { -ERR (asprintf (&dest_name,"%s.~signed~" , module_name) <0 , -"asprintf" ); - replace_orig = true; - }#ifdef USE_PKCS7 if (strcmp (hash_algo,"sha1" ) !=0 ) {
@@ -380,20 +347,20 @@ int main(int argc, char **argv)#endif /* Open the module file */ - bm =BIO_new_file (module_name,"rb" ); -ERR (!bm,"%s" , module_name); + bm =BIO_new_file (opts->module_name,"rb" ); +ERR (!bm,"%s" , opts->module_name); -if (!raw_sig) { +if (!opts->raw_sig) {/* Read the private key and the X.509 cert the PKCS#7 message * will point to. */ - private_key =read_private_key (private_key_name); - x509 =read_x509 (x509_name); + private_key =read_private_key (opts->private_key_name); + x509 =read_x509 (opts->x509_name);/* Digest the module data. */ OpenSSL_add_all_digests ();display_openssl_errors (__LINE__); - digest_algo =EVP_get_digestbyname (hash_algo); + digest_algo =EVP_get_digestbyname (opts->hash_algo);ERR (!digest_algo,"EVP_get_digestbyname" );#ifndef USE_PKCS7
@@ -405,7 +372,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 | +CMS_NOSMIMECAP | opts->use_keyid | use_signed_attrs),"CMS_add1_signer" ); ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0,
@@ -418,11 +385,11 @@ int main(int argc, char **argv)ERR (!pkcs7,"PKCS7_sign" );#endif -if (save_sig) { +if (opts->save_sig) {char *sig_file_name;BIO *b; -ERR (asprintf (&sig_file_name,"%s.p7s" , module_name) <0 , +ERR (asprintf (&sig_file_name,"%s.p7s" , opts->module_name) <0 ,"asprintf" ); b =BIO_new_file (sig_file_name,"wb" );ERR (!b,"%s" , sig_file_name);
@@ -436,7 +403,7 @@ int main(int argc, char **argv)BIO_free (b); } -if (sign_only) { +if (opts->sign_only) {BIO_free (bm);return 0 ; }
@@ -445,24 +412,24 @@ int main(int argc, char **argv)/* Open the destination file now so that we can shovel the module data * across as we read it. */ - bd =BIO_new_file (dest_name,"wb" ); -ERR (!bd,"%s" , dest_name); + bd =BIO_new_file (opts->dest_name,"wb" ); +ERR (!bd,"%s" , opts->dest_name);/* Append the marker and the PKCS#7 message to the destination file */ -ERR (BIO_reset (bm) <0 ,"%s" , module_name); +ERR (BIO_reset (bm) <0 ,"%s" , opts->module_name);while ((n =BIO_read (bm, buf,sizeof (buf))), n >0 ) { -ERR (BIO_write (bd, buf, n) <0 ,"%s" , dest_name); +ERR (BIO_write (bd, buf, n) <0 ,"%s" , opts->dest_name); }BIO_free (bm); -ERR (n <0 ,"%s" , module_name); +ERR (n <0 ,"%s" , opts->module_name); module_size =BIO_number_written (bd); -if (!raw_sig) { +if (!opts->raw_sig) {#ifndef USE_PKCS7 -ERR (i2d_CMS_bio_stream (bd, cms,NULL ,0 ) <0 ,"%s" , dest_name); +ERR (i2d_CMS_bio_stream (bd, cms,NULL ,0 ) <0 ,"%s" , opts->dest_name);#else -ERR (i2d_PKCS7_bio (bd, pkcs7) <0 ,"%s" , dest_name); +ERR (i2d_PKCS7_bio (bd, pkcs7) <0 ,"%s" , opts->dest_name);#endif }else {BIO *b;
@@ -470,23 +437,49 @@ int main(int argc, char **argv)/* Read the raw signature file and write the data to the * destination file */ - b =BIO_new_file (raw_sig_name,"rb" ); -ERR (!b,"%s" , raw_sig_name); + b =BIO_new_file (opts->raw_sig_name,"rb" ); +ERR (!b,"%s" , opts->raw_sig_name);while ((n =BIO_read (b, buf,sizeof (buf))), n >0 ) -ERR (BIO_write (bd, buf, n) <0 ,"%s" , dest_name); +ERR (BIO_write (bd, buf, n) <0 ,"%s" , opts->dest_name);BIO_free (b); } sig_size =BIO_number_written (bd) - module_size; sig_info.sig_len =htonl (sig_size); -ERR (BIO_write (bd, &sig_info,sizeof (sig_info)) <0 ,"%s" , dest_name); -ERR (BIO_write (bd, magic_number,sizeof (magic_number) -1 ) <0 ,"%s" , dest_name); +ERR (BIO_write (bd, &sig_info,sizeof (sig_info)) <0 ,"%s" , opts->dest_name); +ERR (BIO_write (bd, magic_number,sizeof (magic_number) -1 ) <0 ,"%s" , opts->dest_name); -ERR (BIO_free (bd) <0 ,"%s" , dest_name); +ERR (BIO_free (bd) <0 ,"%s" , opts->dest_name);/* Finally, if we're signing in place, replace the original. */ -if (replace_orig) -ERR (rename (dest_name, module_name) <0 ,"%s" , dest_name); +if (opts->replace_orig) +ERR (rename (opts->dest_name, opts->module_name) <0 ,"%s" , opts->dest_name);return 0 ; } + +int main (int argc,char **argv) +{ +struct cmd_opts opts = {}; + +parse_args (argc, argv, &opts); + argc -= optind; + argv += optind; + +if (!argv[0 ] || argc !=1 ) +format (); + +if (opts.dest_name &&strcmp (argv[0 ], opts.dest_name)) { + opts.replace_orig = false; + }else { +ERR (asprintf (&opts.dest_name,"%s.~signed~" , opts.module_name) <0 , +"asprintf" ); + opts.replace_orig = true; + } + +OpenSSL_add_all_algorithms (); +ERR_load_crypto_strings (); +ERR_clear_error (); + +return sign_single_file (&opts); +}
Signature · 1 line
2.41.0
Re: [PATCH v9 3/7] sign-file: move file signing logic to its own function
Quoted 1 line · Shreenidhi Shedi
Keep the main function bare minimal and do less in main function.
"do less" means exactly what?
Quoted 12 lines
This patch is pre-work for bulk module signing support.
Signed-off-by Shreenidhi Shedi <[email protected]>--- scripts/sign-file.c | 115 +++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 61 deletions(-)scripts/sign-file.c +0
-0
scripts/sign-file.c static void parse_args(int argc, char **argv, struct cmd_opts *opts) · line 319
Quoted 9 lines
scripts/sign-file.c +2
-2@@ -313,10 +313,10 @@ static void parse_args(int argc, char **argv, struct cmd_opts *opts) }while (opt !=-1 ); } -int main (int argc,char **argv) +static int sign_single_file (struct cmd_opts *opts) {struct module_signature sig_info = { .id_type =PKEY_ID_PKCS7 }; -unsigned char buf[4096 ]; +unsigned char buf[4096 ] = {};
Why make this change? What requires it to now be zero initialized?
thanks,
greg k-h
PATCH v9 4/7 sign-file: add support to sign modules in bulk
In reply to Shreenidhi ShediIn the existing system, we need to invoke sign-file binary for every module we want to sign. This patch adds support to give modules list in bulk and it will sign them all one by one.
--- scripts/sign-file.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-)
scripts/sign-file.c +27 -14
@@ -224,6 +224,7 @@ struct cmd_opts {bool replace_orig;bool raw_sig;bool sign_only; +bool bulk_sign;#ifndef USE_PKCS7 unsigned int use_keyid;#endif
@@ -252,10 +253,10 @@ static void parse_args(int argc, char **argv, struct cmd_opts *opts) do { #ifndef USE_PKCS7 - opt = getopt_long_only(argc, argv, "hpds:i:a:x:t:r:", + opt = getopt_long_only(argc, argv, "hpdbs:i:a:x:t:r:", cmd_options, &opt_index); #else - opt = getopt_long_only(argc, argv, "hpdks:i:a:x:t:r:", + opt = getopt_long_only(argc, argv, "hpdkbs:i:a:x:t:r:", cmd_options, &opt_index); #endif switch (opt) {
@@ -303,6 +304,10 @@ static void parse_args(int argc, char **argv, struct cmd_opts *opts) opts->replace_orig = true;break ; +case 'b' : + opts->bulk_sign = true; +break ; +case -1 :break ;
@@ -460,26 +465,34 @@ static int sign_single_file(struct cmd_opts *opts)int main (int argc,char **argv) { +int i;struct cmd_opts opts = {};parse_args (argc, argv, &opts); argc -= optind; argv += optind; -if (!argv[0 ] || argc !=1 ) -format (); - -if (opts.dest_name &&strcmp (argv[0 ], opts.dest_name)) { - opts.replace_orig = false; - }else { -ERR (asprintf (&opts.dest_name,"%s.~signed~" , opts.module_name) <0 , -"asprintf" ); - opts.replace_orig = true; - } -OpenSSL_add_all_algorithms ();ERR_load_crypto_strings ();ERR_clear_error (); -return sign_single_file (&opts); +for (i =0 ; i < argc; ++i) { + opts.module_name = argv[i]; + +if (!opts.bulk_sign && opts.dest_name &&strcmp (argv[i], opts.dest_name)) { + opts.replace_orig = false; + }else { +ERR (asprintf (&opts.dest_name,"%s.~signed~" , opts.module_name) <0 , +"asprintf" ); +if (!opts.replace_orig) + opts.replace_orig = true; + } + +if (sign_single_file (&opts)) { +fprintf (stderr,"Failed to sign: %s module\n" , opts.module_name); +return -1 ; + } + } + +return 0 ; }
Signature · 1 line
2.41.0
Re: [PATCH v9 4/7] sign-file: add support to sign modules in bulk
Quoted 3 lines · Shreenidhi Shedi
In the existing system, we need to invoke sign-file binary for every module we want to sign. This patch adds support to give modules list in bulk and it will sign them all one by one.
But you never actually use this option in the kernel build process? If not, why add this at all?
thanks,
greg k-h
Re: [PATCH v9 4/7] sign-file: add support to sign modules in bulk
Quoted 6 lines · Greg KH
Quoted 3 lines · Shreenidhi Shedi
In the existing system, we need to invoke sign-file binary for every module we want to sign. This patch adds support to give modules list in bulk and it will sign them all one by one.
Quoted 6 lines
But you never actually use this option in the kernel build process? If not, why add this at all?
thanks,
greg k-h
Agree.
The bulk-sign flag is never used in the upstream kernel. We cannot accept this.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v9 5/7 sign-file: improve help message
In reply to Shreenidhi ShediAdd a proper help message with examples on how to use this tool.
--- scripts/sign-file.c | 48 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-)
scripts/sign-file.c +41 -7
@@ -74,12 +74,43 @@ struct module_signature {static char magic_number[] ="~Module signature appended~\n" ;static __attribute__((noreturn)) -void format (void ) +void print_usage (void ) { -fprintf (stderr, -"Usage: scripts/sign-file [-dp] <hash algo> <key> <x509> <module> [<dest>]\n" ); -fprintf (stderr, -" scripts/sign-file -s <raw sig> <hash algo> <x509> <module> [<dest>]\n" ); +fprintf (stderr,"Usage: scripts/sign-file [OPTIONS]... [MODULE]...\n" ); +fprintf (stderr,"Available options:\n" ); +fprintf (stderr,"-h, --help Print this help message and exit\n" ); + +fprintf (stderr,"\nOptional args:\n" ); +fprintf (stderr,"-s, --rawsig <sig> Raw signature\n" ); +fprintf (stderr,"-p, --savesig Save signature\n" ); +fprintf (stderr,"-d, --signonly Sign only\n" ); +#ifndef USE_PKCS7 +fprintf (stderr,"-k, --usekeyid Use key ID\n" ); +#endif +fprintf (stderr,"-b, --bulksign Sign modules in bulk\n" ); +fprintf (stderr,"-r, --replaceorig Replace original\n" ); +fprintf (stderr,"-t, --dest <dest> Destination path " ); +fprintf (stderr,"(Exclusive with bulk option)\n" ); + +fprintf (stderr,"\nMandatory args:\n" ); +fprintf (stderr,"-i, --privkey <key> Private key\n" ); +fprintf (stderr,"-a, --hashalgo <alg> Hash algorithm\n" ); +fprintf (stderr,"-x, --x509 <x509> X509\n" ); + +fprintf (stderr,"\nExamples:\n" ); + +fprintf (stderr,"\n Regular signing:\n" ); +fprintf (stderr," scripts/sign-file -a sha512 -i certs/signing_key.pem " ); +fprintf (stderr,"-x certs/signing_key.x509 <module>\n" ); + +fprintf (stderr,"\n Signing with destination path:\n" ); +fprintf (stderr," scripts/sign-file -a sha512 -i certs/signing_key.pem " ); +fprintf (stderr,"-x certs/signing_key.x509 <module> -t <path>\n" ); + +fprintf (stderr,"\n Signing modules in bulk:\n" ); +fprintf (stderr," scripts/sign-file -a sha512 -i certs/signing_key.pem " ); +fprintf (stderr,"-x certs/signing_key.x509 -b <module1> <module2> ...\n" ); +exit (2 ); }
@@ -281,7 +312,7 @@ static void parse_args(int argc, char **argv, struct cmd_opts *opts)#endif case 'h' : -format (); +print_usage ();break ;case 'i' :
@@ -312,7 +343,7 @@ static void parse_args(int argc, char **argv, struct cmd_opts *opts)break ;default : -format (); +print_usage ();break ; } }while (opt !=-1 );
@@ -472,6 +503,9 @@ int main(int argc, char **argv) argc -= optind; argv += optind; +if ((opts.bulk_sign && opts.dest_name) || (!opts.bulk_sign && argc !=1 )) +print_usage (); +OpenSSL_add_all_algorithms ();ERR_load_crypto_strings ();ERR_clear_error ();
Signature · 1 line
2.41.0
Re: [PATCH v9 5/7] sign-file: improve help message
Quoted 1 line · Shreenidhi Shedi
Add a proper help message with examples on how to use this tool.
This should be the first patch, right? Then you can add the proper documentation for the new features when you add them.
thanks,
greg k-h
PATCH v9 6/7 sign-file: use const with a global string constant
In reply to Shreenidhi ShediReported by checkpatch.
--- scripts/sign-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/sign-file.c +1 -1
@@ -71,7 +71,7 @@ struct module_signature {#define PKEY_ID_PKCS7 2 -static char magic_number[] ="~Module signature appended~\n" ; +static const char magic_number[] ="~Module signature appended~\n" ;static __attribute__((noreturn))void print_usage (void )
Signature · 1 line
2.41.0
PATCH v9 7/7 sign-file: fix do while styling issue
In reply to Shreenidhi ShediReported by checkpatch.
--- scripts/sign-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/sign-file.c +1 -1
@@ -147,7 +147,7 @@ static void drain_openssl_errors(void)if (__cond) { \ errx(1, fmt, ## __VA_ARGS__); \ } \ - }while (0 ) + }while (0 ) static const char *key_pass;
Signature · 1 line
2.41.0