Use PKCS11_MODULE_PATH environment variable

bphinz · Jan 28, 2016 · 9576c9b · 9576c9b
1 parent e163368
commit 9576c9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,7 @@
 NEWS for Libp11 -- History of user visible changes
 
 New in 0.4.0; unreleased;
+* Use PKCS11_MODULE_PATH environment variable (Doug Engert)
 * Added support for building against OpenSSL 1.1.0-dev (Doug Engert)
 * Added support for ECDH key derivation (Doug Engert)
 * Fixed building against OpenSSL 0.9.8 (Michał Trojnara)

diff --git a/src/eng_back.c b/src/eng_back.c
@@ -189,6 +189,8 @@ int pkcs11_init(ENGINE * engine)
 	 */
 	(void)engine;
 
+	if (mod == NULL)
+		mod = getenv("PKCS11_MODULE_PATH");
 #ifdef DEFAULT_PKCS11_MODULE
 	if (mod == NULL)
 		mod = DEFAULT_PKCS11_MODULE;