nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-04 17:00:11 -05:00
Code Issues Projects Releases Wiki Activity

Fix non-interactive PVK (MSBLOB) key decryption

Browse Source 
Fix #130
This commit is contained in:
Michał Trojnara 2022-03-06 18:54:51 +01:00
parent d8a182614c
commit 7affd85c46
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osslsigncode.c
View File

@ -5119,23 +5119,23 @@ static char *find_pvk_key(GLOBAL_OPTIONS *options)
static int read_pvk_key(GLOBAL_OPTIONS *options, CRYPTO_PARAMS *cparams) static int read_pvk_key(GLOBAL_OPTIONS *options, CRYPTO_PARAMS *cparams)
{ {
BIO *btmp; BIO *btmp;
int ret = 0;
btmp = BIO_new_file(options->pvkfile, "rb"); btmp = BIO_new_file(options->pvkfile, "rb");
if (!btmp) { if (!btmp) {
printf("Failed to read private key file: %s\n", options->pvkfile); printf("Failed to read private key file: %s\n", options->pvkfile);
return 0; /* FAILED */ return 0; /* FAILED */
} }
if (((cparams->pkey = b2i_PVK_bio(btmp, NULL, options->pass ? options->pass : "")) == NULL && cparams->pkey = b2i_PVK_bio(btmp, NULL, options->pass ? options->pass : "");
(BIO_seek(btmp, 0) == 0) && if (!cparams->pkey && options->askpass) {
(cparams->pkey = b2i_PVK_bio(btmp, NULL, NULL)) == NULL)) { (void)BIO_seek(btmp, 0);
printf("Failed to decode private key file: %s\n", options->pvkfile); cparams->pkey = b2i_PVK_bio(btmp, NULL, NULL);
goto out; /* FAILED */
} }
ret = 1; /* OK */
out:
BIO_free(btmp); BIO_free(btmp);
return ret; if (!cparams->pkey) {
printf("Failed to decode private key file: %s\n", options->pvkfile);
return 0; /* FAILED */
}
return 1; /* OK */
} }
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE