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

Support loading OpenSSL 3.0+ providers without -pkcs11module option (e.g., CNG)

Browse Source
This commit is contained in:
olszomal
2025-06-03 10:47:05 +02:00
committed by Michał Trojnara
parent 6b56aef073
commit dd9b81281f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS.md
View File

@ -3,7 +3,9 @@
### 2.10 (unreleased) ### 2.10 (unreleased)
- added JavaScript signing - added JavaScript signing
- added PKCS#11 provider support (requires OpenSSL 3.0) - added PKCS#11 provider support (requires OpenSSL 3.0+)
- added support for providers without specifying "-pkcs11module" option
(OpenSSL 3.0+, e.g., for the upcoming CNG provider)
- added compatiblity with the CNG engine version 1.1 or later - added compatiblity with the CNG engine version 1.1 or later
- added the "-engineCtrl" option to control hardware and CNG engines - added the "-engineCtrl" option to control hardware and CNG engines
- added the '-blobFile' option to specify a file containing the blob content - added the '-blobFile' option to specify a file containing the blob content

6
osslsigncode.c
View File

@ -4317,6 +4317,12 @@ static int read_crypto_params(GLOBAL_OPTIONS *options)
} }
#endif /* !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER>=0x30000000L */ #endif /* !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER>=0x30000000L */
else { else {
#if OPENSSL_VERSION_NUMBER>=0x30000000L
if (options->provider) {
/* Attempt to load a provider without a PKCS#11 module (e.g., for the CNG provider) */
(void)provider_load(options->provider);
}
#endif /* OPENSSL_VERSION_NUMBER>=0x30000000L */
/* Load the the private key ('-key' option) */ /* Load the the private key ('-key' option) */
load_objects_from_store(options->keyfile, options->pass, &options->pkey, NULL, NULL); load_objects_from_store(options->keyfile, options->pass, &options->pkey, NULL, NULL);
} }