sshkey_new() might return NULL (pkcs#11 code only); ok djm@
authormarkus <markus@openbsd.org>
Tue, 30 May 2017 14:15:17 +0000 (14:15 +0000)
committermarkus <markus@openbsd.org>
Tue, 30 May 2017 14:15:17 +0000 (14:15 +0000)
usr.bin/ssh/ssh-pkcs11.c

index edbb343..d4b2be4 100644 (file)
@@ -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.
  *
@@ -526,7 +526,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;