Browse code
special handling for PKCS11 providers on win32
Change win32 dynamic loader behavior when supplying an absolute path.
The DLL location is considered/preferred to resolve dependencies.
Support in pkcs11-helper for loader flag is detected at compile time.
3rd party DLLs and additional dependencies do no longer need to be moved
to the OpenVPN directory or require changes to %PATH% configuration.
Signed-off-by: Marc Becker <marc.becker@astos.de>
Acked-by: Selva Nair <selva.nair@gmail.com>
Message-Id: <20221211200108.1402-1-marc.becker@astos.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25646.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit e299b8d0d62a4763b20bf9a3bd6aadf414aa89fe)
Marc Becker authored on 2022/12/12 05:01:08Showing 1 changed files
| ... | ... |
@@ -420,6 +420,13 @@ pkcs11_addProvider( |
| 420 | 420 |
{
|
| 421 | 421 |
rv = pkcs11h_setProviderProperty(provider, PKCS11H_PROVIDER_PROPERTY_CERT_IS_PRIVATE, &cert_is_private, sizeof(cert_is_private)); |
| 422 | 422 |
} |
| 423 |
+#if defined(WIN32) && defined(PKCS11H_PROVIDER_PROPERTY_LOADER_FLAGS) |
|
| 424 |
+ if (rv == CKR_OK && platform_absolute_pathname(provider)) |
|
| 425 |
+ {
|
|
| 426 |
+ unsigned loader_flags = LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; |
|
| 427 |
+ rv = pkcs11h_setProviderProperty(provider, PKCS11H_PROVIDER_PROPERTY_LOADER_FLAGS, &loader_flags, sizeof(loader_flags)); |
|
| 428 |
+ } |
|
| 429 |
+#endif |
|
| 423 | 430 |
|
| 424 | 431 |
if (rv != CKR_OK || (rv = pkcs11h_initializeProvider(provider)) != CKR_OK) |
| 425 | 432 |
{
|