lkml.org 
[lkml]   [2023]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ PATCH v4 2/6] sign-file: move file signing logic to its own function
    Date
    From: Shreenidhi Shedi <yesshedi@gmail.com>

    Keep the main function bare minimal and do less in main function.

    Signed-off-by: Shreenidhi Shedi <yesshedi@gmail.com>
    ---
    scripts/sign-file.c | 67 +++++++++++++++++++++++++--------------------
    1 file changed, 38 insertions(+), 29 deletions(-)

    diff --git a/scripts/sign-file.c b/scripts/sign-file.c
    index dbbde1aef3d9..3e6d776d126c 100644
    --- a/scripts/sign-file.c
    +++ b/scripts/sign-file.c
    @@ -315,10 +315,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_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 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
    \
     
     \ /
      Last update: 2023-03-27 00:30    [W:2.847 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site