]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: terminate process if requested to load a PKCS#11 provider
authordjm@openbsd.org <djm@openbsd.org>
Wed, 19 Jul 2023 13:55:53 +0000 (13:55 +0000)
committerDamien Miller <djm@mindrot.org>
Wed, 19 Jul 2023 14:18:26 +0000 (00:18 +1000)
that isn't a PKCS#11 provider; from / ok markus@

OpenBSD-Commit-ID: 39532cf18b115881bb4cfaee32084497aadfa05c

ssh-pkcs11.c

index 6be647ec443c152a0d52f1dd258d8a0ba7d57328..0b51e7753882fd6bc747c12171e21db708313b7a 100644 (file)
@@ -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;