DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

OpenSSL: Allow pkcs11_module_path to be NULL

Browse source 
New versions of engine_pkcs11 will automatically use the system's
p11-kit-proxy.so to make the globally-configured PKCS#11 tokens available
by default. So invoking the engine without an explicit module path is
not an error.

Older engines will fail but gracefully enough, so although it's still an
error in that case there's no need for us to catch it for ourselves.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2014-12-18 15:09:16 +00:00 committed by Jouni Malinen
parent 7fe84009f8
commit 5c8ab0d49c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/crypto/tls_openssl.c
View file

@ -692,12 +692,15 @@ static int tls_engine_load_dynamic_pkcs11(const char *pkcs11_so_path,
NULL, NULL NULL, NULL
}; };
if (!pkcs11_so_path || !pkcs11_module_path) if (!pkcs11_so_path)
return 0; return 0;
pre_cmd[1] = pkcs11_so_path; pre_cmd[1] = pkcs11_so_path;
pre_cmd[3] = engine_id; pre_cmd[3] = engine_id;
if (pkcs11_module_path)
post_cmd[1] = pkcs11_module_path; post_cmd[1] = pkcs11_module_path;
else
post_cmd[0] = NULL;
wpa_printf(MSG_DEBUG, "ENGINE: Loading pkcs11 Engine from %s", wpa_printf(MSG_DEBUG, "ENGINE: Loading pkcs11 Engine from %s",
pkcs11_so_path); pkcs11_so_path);