[pkg-opensc-commit] [libp11] 25/86: Use PKCS11_MODULE_PATH environment variable

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit 9576c9b37b43247028890d78b216130068c3d391
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Thu Jan 28 10:11:21 2016 +0100

    Use PKCS11_MODULE_PATH environment variable
---
 NEWS           | 1 +
 src/eng_back.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 0cea0c7..f631dca 100644
--- 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
index bfe8dc4..352bd5c 100644
--- 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git