mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Add PKCS#11 module name to p11helper errors
The p11helper module now includes the name of the PKCS#11 shared library in error messages. Fixes: https://pagure.io/freeipa/issue/8015 Co-Authored-By: Mikhail Novosyolov <m.novosyolov@rosalinux.ru> Signed-off-by: Christian Heimes <cheimes@redhat.com> Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
committed by
Rob Crittenden
parent
6316a00632
commit
94b4af55b0
@@ -471,12 +471,14 @@ def loadLibrary(module):
|
||||
# pylint: disable=no-member
|
||||
pDynLib = _ffi.dlopen(module, _ffi.RTLD_NOW | _ffi.RTLD_LOCAL)
|
||||
else:
|
||||
raise Exception()
|
||||
raise Error("PKCS#11 module name is empty")
|
||||
|
||||
# Retrieve the entry point for C_GetFunctionList
|
||||
pGetFunctionList = pDynLib.C_GetFunctionList
|
||||
if pGetFunctionList == NULL:
|
||||
raise Exception()
|
||||
raise Error(
|
||||
f"Module '{module}' has no function 'C_GetFunctionList'."
|
||||
)
|
||||
|
||||
# Store the handle so we can dlclose it later
|
||||
|
||||
@@ -843,7 +845,7 @@ class P11_Helper:
|
||||
try:
|
||||
pGetFunctionList, module_handle = loadLibrary(library_path)
|
||||
except Exception:
|
||||
raise Error("Could not load the library.")
|
||||
raise Error(f"Could not load the library '{library_path}'.")
|
||||
|
||||
self.module_handle = module_handle
|
||||
|
||||
|
Reference in New Issue
Block a user