summaryrefslogtreecommitdiffstats
path: root/ssh-pkcs11.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2023-07-19 15:55:53 +0200
committerDamien Miller <djm@mindrot.org>2023-07-19 16:18:26 +0200
commit892506b13654301f69f9545f48213fc210e5c5cc (patch)
tree05bd4b06c843481880e1fd99568a67d9d4e65877 /ssh-pkcs11.c
parentagent_fuzz doesn't want stdint.h conditionalised (diff)
downloadopenssh-892506b13654301f69f9545f48213fc210e5c5cc.tar.xz
openssh-892506b13654301f69f9545f48213fc210e5c5cc.zip
upstream: terminate process if requested to load a PKCS#11 provider
that isn't a PKCS#11 provider; from / ok markus@ OpenBSD-Commit-ID: 39532cf18b115881bb4cfaee32084497aadfa05c
Diffstat (limited to 'ssh-pkcs11.c')
-rw-r--r--ssh-pkcs11.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 6be647ec4..0b51e7753 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.56 2023/03/08 05:33:53 tb Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.57 2023/07/19 13:55:53 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
* Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -1537,10 +1537,8 @@ pkcs11_register_provider(char *provider_id, char *pin,
error("dlopen %s failed: %s", provider_id, dlerror());
goto fail;
}
- if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL) {
- error("dlsym(C_GetFunctionList) failed: %s", dlerror());
- goto fail;
- }
+ if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL)
+ fatal("dlsym(C_GetFunctionList) failed: %s", dlerror());
p = xcalloc(1, sizeof(*p));
p->name = xstrdup(provider_id);
p->handle = handle;