upstream commit

sshkey_new() might return NULL (pkcs#11 code only); ok
djm@

Upstream-ID: de9f2ad4a42c0b430caaa7d08dea7bac943075dd

diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index aaf712d9a5ba7d0aafa9266059bc48ee750f0443..ea97508f125e4c99ebce2ea3cff3b43252548b90 100644 (file)
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.23 2016/10/28 03:33:52 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.24 2017/05/30 14:15:17 markus Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  *
@@ -537,7 +537,8 @@ pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx,
                }
                if (rsa && rsa->n && rsa->e &&
                    pkcs11_rsa_wrap(p, slotidx, &attribs[0], rsa) == 0) {
-                       key = sshkey_new(KEY_UNSPEC);
+                       if ((key = sshkey_new(KEY_UNSPEC)) == NULL)
+                               fatal("sshkey_new failed");
                        key->rsa = rsa;
                        key->type = KEY_RSA;
                        key->flags |= SSHKEY_FLAG_EXT;