Use existing wrapper for pkcs11h_addProvider to have arguments with
"magic values" for pkcs11-helper call in a central place.
Slot event argument to pkcs11h_addProvider has NOT been a boolean for
at least 15 years.
Luckily the default is PKCS11H_SLOTEVENT_METHOD_AUTO=0=FALSE.
Signed-off-by: Marc Becker <marc.bec...@astos.de>
---
v2: propper commit message, error message without error code reference
---
src/openvpn/pkcs11.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c
index 507af17c..fbc4c472 100644
--- a/src/openvpn/pkcs11.c
+++ b/src/openvpn/pkcs11.c
@@ -853,19 +853,9 @@ show_pkcs11_ids(
goto cleanup;
}
- if (
- (rv = pkcs11h_addProvider(
- provider,
- provider,
- TRUE,
- 0,
- FALSE,
- 0,
- cert_private ? TRUE : FALSE
- )) != CKR_OK
- )
+ if (!pkcs11_addProvider(provider, TRUE, 0, cert_private ? TRUE : FALSE))
{
- msg(M_FATAL, "PKCS#11: Cannot add provider '%s' %ld-'%s'", provider,
rv, pkcs11h_getMessage(rv));
+ msg(M_FATAL, "Failed to add PKCS#11 provider '%s", provider);
goto cleanup;
}
--
2.38.1.windows.1
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
