nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-07-02 19:22:47 -05:00
Code Issues Projects Releases Wiki Activity

initialize crypto params

Browse Source
This commit is contained in:
olszomal
2020-06-08 11:33:16 +02:00
committed by Michał Trojnara
parent 7dd36a5c24
commit 48dc052540
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osslsigncode.c
View File

@ -4476,9 +4476,6 @@ static int read_crypto_params(GLOBAL_OPTIONS *options, CRYPTO_PARAMS *cparams)
const int CMD_MANDATORY = 0; const int CMD_MANDATORY = 0;
int ret = 1; int ret = 1;
/* reset crypto */
memset(cparams, 0, sizeof(CRYPTO_PARAMS));
options->pvkfile = read_key(options); options->pvkfile = read_key(options);
if (options->pkcs12file != NULL) { if (options->pkcs12file != NULL) {
if ((btmp = BIO_new_file(options->pkcs12file, "rb")) == NULL || if ((btmp = BIO_new_file(options->pkcs12file, "rb")) == NULL ||
@ -5129,6 +5126,9 @@ int main(int argc, char **argv)
goto err_cleanup; goto err_cleanup;
if (!read_password(&options)) if (!read_password(&options))
goto err_cleanup; goto err_cleanup;
/* reset crypto */
memset(&cparams, 0, sizeof(CRYPTO_PARAMS));
/* read key and certificates */ /* read key and certificates */
if (cmd == CMD_SIGN && !read_crypto_params(&options, &cparams)) if (cmd == CMD_SIGN && !read_crypto_params(&options, &cparams))
goto err_cleanup; goto err_cleanup;