Messages in this thread Patch in this message | | | From | Shreenidhi Shedi <> | Subject | [PATCH 1/4] sign-file: refactor argument parsing logic | Date | Thu, 9 Feb 2023 21:35:20 +0530 |
| |
Add support for bulk signing of modules.
Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com> --- sign-file.c | 349 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 228 insertions(+), 121 deletions(-)
diff --git a/sign-file.c b/sign-file.c index 598ef54..76fee75 100644 --- a/sign-file.c +++ b/sign-file.c @@ -213,15 +213,117 @@ static X509 *read_x509(const char *x509_name) return x509; }
+struct cmd_opts { + char *hash_algo; + char *dest_name; + char *private_key_name; + char *raw_sig_name; + char *x509_name; + char *module_name; + bool save_sig; + bool replace_orig; + bool raw_sig; + bool sign_only; + bool bulk_sign; + +#ifndef USE_PKCS7 + unsigned int use_keyid; +#endif +}; + +void parse_args(int *argc, char **argv, struct cmd_opts *opts) +{ + struct option cmd_options[] = { + /* These options set a flag. */ + {"help", no_argument, 0, 'h'}, + {"savesig", no_argument, 0, 's'}, + {"signonly", no_argument, 0, 'o'}, + {"bulksign", no_argument, 0, 'b'}, +#ifndef USE_PKCS7 + {"usekeyid", no_argument, 0, 'k'}, +#endif + {"rawsig", required_argument, 0, 'r'}, + {"privkey", required_argument, 0, 'p'}, + {"hashalgo", required_argument, 0, 'a'}, + {"x509", required_argument, 0, 'x'}, + {"dest", required_argument, 0, 'd'}, + {"replaceorig", required_argument, 0, 'l'}, + {0, 0, 0, 0} + }; + + int opt; + int opt_index; + + do { +#ifndef USE_PKCS7 + opt = getopt_long_only(*argc, argv, "hsobr:p:a:x:d:l:", + cmd_options, &opt_index); +#else + opt = getopt_long_only(*argc, argv, "hsobkr:p:a:x:d:l:", + cmd_options, &opt_index); +#endif + switch (opt) { + case 'h': + format(); + break; + + case 'r': + opts->raw_sig = true; + opts->raw_sig_name = optarg; + break; + + case 's': + opts->save_sig = true; + break; + + case 'o': + opts->sign_only = true; + opts->save_sig = true; + break; + +#ifndef USE_PKCS7 + case 'k': + opts->use_keyid = CMS_USE_KEYID; + break; +#endif + + case 'p': + opts->private_key_name = optarg; + break; + + case 'a': + opts->hash_algo = optarg; + break; + + case 'x': + opts->x509_name = optarg; + break; + + case 'd': + opts->dest_name = optarg; + break; + + case 'l': + opts->replace_orig = true; + break; + + case 'b': + opts->bulk_sign = true; + break; + + 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 *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 +331,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 i, n; + struct cmd_opts opts = {0}; + OpenSSL_add_all_algorithms(); ERR_load_crypto_strings(); ERR_clear_error(); @@ -248,159 +351,163 @@ int main(int argc, char **argv) use_signed_attrs = PKCS7_NOATTR; #endif
- 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; + 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; + bool bulk_sign = opts.bulk_sign; + #ifndef USE_PKCS7 - case 'k': use_keyid = CMS_USE_KEYID; break; + unsigned int use_keyid = opts.bulk_sign; #endif - case -1: break; - default: format(); - } - } while (opt != -1);
- argc -= optind; - argv += optind; - if (argc < 4 || argc > 5) + if ((bulk_sign && dest_name) || (!bulk_sign && argc != 1)) format();
- if (raw_sig) { - raw_sig_name = argv[0]; - hash_algo = argv[1]; - } else { - hash_algo = argv[0]; - private_key_name = argv[1]; - } - x509_name = argv[2]; - module_name = argv[3]; - if (argc == 5 && strcmp(argv[3], argv[4]) != 0) { - dest_name = argv[4]; + if (dest_name && strcmp(argv[0], dest_name)) { replace_orig = false; } else { ERR(asprintf(&dest_name, "%s.~signed~", module_name) < 0, - "asprintf"); + "asprintf"); replace_orig = true; }
#ifdef USE_PKCS7 if (strcmp(hash_algo, "sha1") != 0) { fprintf(stderr, "sign-file: %s only supports SHA1 signing\n", - OPENSSL_VERSION_TEXT); + OPENSSL_VERSION_TEXT); exit(3); } #endif
- /* Open the module file */ - bm = BIO_new_file(module_name, "rb"); - ERR(!bm, "%s", module_name); - - if (!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); + for (i = 0; i < argc; i++) { + module_name = argv[i];
- /* Digest the module data. */ - OpenSSL_add_all_digests(); - display_openssl_errors(__LINE__); - digest_algo = EVP_get_digestbyname(hash_algo); - ERR(!digest_algo, "EVP_get_digestbyname"); + if (bulk_sign) { + ERR(asprintf(&dest_name, "%s.~signed~", module_name) < 0, + "asprintf"); + if (!replace_orig) + replace_orig = true; + } + /* Open the module file */ + bm = BIO_new_file(module_name, "rb"); + ERR(!bm, "%s", module_name); + + if (!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); + + /* Digest the module data. */ + OpenSSL_add_all_digests(); + display_openssl_errors(__LINE__); + digest_algo = EVP_get_digestbyname(hash_algo); + ERR(!digest_algo, "EVP_get_digestbyname");
#ifndef USE_PKCS7 - /* Load the signature message from the digest buffer. */ - cms = CMS_sign(NULL, NULL, NULL, NULL, - CMS_NOCERTS | CMS_PARTIAL | CMS_BINARY | - CMS_DETACHED | CMS_STREAM); - ERR(!cms, "CMS_sign"); - - ERR(!CMS_add1_signer(cms, x509, private_key, digest_algo, - CMS_NOCERTS | CMS_BINARY | - CMS_NOSMIMECAP | use_keyid | - use_signed_attrs), - "CMS_add1_signer"); - ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0, - "CMS_final"); + /* Load the signature message from the digest buffer. */ + cms = CMS_sign(NULL, NULL, NULL, NULL, + CMS_NOCERTS | CMS_PARTIAL | CMS_BINARY | + CMS_DETACHED | CMS_STREAM); + ERR(!cms, "CMS_sign"); + + ERR(!CMS_add1_signer(cms, x509, private_key, digest_algo, + CMS_NOCERTS | CMS_BINARY | + CMS_NOSMIMECAP | use_keyid | + use_signed_attrs), + "CMS_add1_signer"); + ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0, + "CMS_final");
#else - pkcs7 = PKCS7_sign(x509, private_key, NULL, bm, - PKCS7_NOCERTS | PKCS7_BINARY | - PKCS7_DETACHED | use_signed_attrs); - ERR(!pkcs7, "PKCS7_sign"); + pkcs7 = PKCS7_sign(x509, private_key, NULL, bm, + PKCS7_NOCERTS | PKCS7_BINARY | + PKCS7_DETACHED | use_signed_attrs); + ERR(!pkcs7, "PKCS7_sign"); #endif
- if (save_sig) { - char *sig_file_name; - BIO *b; + if (save_sig) { + char *sig_file_name; + BIO *b;
- ERR(asprintf(&sig_file_name, "%s.p7s", module_name) < 0, - "asprintf"); - b = BIO_new_file(sig_file_name, "wb"); - ERR(!b, "%s", sig_file_name); + ERR(asprintf(&sig_file_name, "%s.p7s", module_name) < 0, + "asprintf"); + b = BIO_new_file(sig_file_name, "wb"); + ERR(!b, "%s", sig_file_name); #ifndef USE_PKCS7 - ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, - "%s", sig_file_name); + ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, + "%s", sig_file_name); #else - ERR(i2d_PKCS7_bio(b, pkcs7) < 0, - "%s", sig_file_name); + ERR(i2d_PKCS7_bio(b, pkcs7) < 0, + "%s", sig_file_name); #endif - BIO_free(b); - } + BIO_free(b); + }
- if (sign_only) { - BIO_free(bm); - return 0; + if (sign_only) { + BIO_free(bm); + return 0; + } } - }
- /* 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); - - /* Append the marker and the PKCS#7 message to the destination file */ - ERR(BIO_reset(bm) < 0, "%s", module_name); - while ((n = BIO_read(bm, buf, sizeof(buf))), - n > 0) { - ERR(BIO_write(bd, buf, n) < 0, "%s", dest_name); - } - BIO_free(bm); - ERR(n < 0, "%s", module_name); - module_size = BIO_number_written(bd); + /* 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); + + /* Append the marker and the PKCS#7 message to the destination file */ + ERR(BIO_reset(bm) < 0, "%s", module_name); + while ((n = BIO_read(bm, buf, sizeof(buf))), + n > 0) { + ERR(BIO_write(bd, buf, n) < 0, "%s", dest_name); + } + BIO_free(bm); + ERR(n < 0, "%s", module_name); + module_size = BIO_number_written(bd);
- if (!raw_sig) { + if (!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", dest_name); #else - ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name); + ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name); #endif - } else { - BIO *b; + } else { + BIO *b;
- /* 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); - while ((n = BIO_read(b, buf, sizeof(buf))), n > 0) - ERR(BIO_write(bd, buf, n) < 0, "%s", dest_name); - BIO_free(b); - } + /* 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); + while ((n = BIO_read(b, buf, sizeof(buf))), n > 0) + ERR(BIO_write(bd, buf, n) < 0, "%s", 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); + 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_free(bd) < 0, "%s", dest_name); + ERR(BIO_free(bd) < 0, "%s", 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); + /* Finally, if we're signing in place, replace the original. */ + if (replace_orig) + ERR(rename(dest_name, module_name) < 0, "%s", dest_name); + }
return 0; } -- 2.39.0
| |