diff options
| author |   djm <djm@openbsd.org> | 2015-10-15 23:08:23 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-10-15 23:08:23 +0000 |
| commit | 919bc6a13ce8fb97b2867803ce044b8ff83c20df (patch) | |
| tree | e6002cb51e2d79530e6c0c6ce11bf3f1bd9a674b /usr.bin/ssh | |
| parent | After spawning, the parent can pledge "stdio rpath wpath cpath" (diff) | |
| download | wireguard-openbsd-919bc6a13ce8fb97b2867803ce044b8ff83c20df.tar.xz wireguard-openbsd-919bc6a13ce8fb97b2867803ce044b8ff83c20df.zip | |
argument to sshkey_from_private() and sshkey_demote() can't be NULL
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index c73c77f3962..bebfca38aeb 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.23 2015/09/13 14:39:16 tim Exp $ */ +/* $OpenBSD: sshkey.c,v 1.24 2015/10/15 23:08:23 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -1724,9 +1724,7 @@ sshkey_from_private(const struct sshkey *k, struct sshkey **pkp) struct sshkey *n = NULL; int ret = SSH_ERR_INTERNAL_ERROR; - if (pkp != NULL) - *pkp = NULL; - + *pkp = NULL; switch (k->type) { #ifdef WITH_OPENSSL case KEY_DSA: @@ -2201,9 +2199,7 @@ sshkey_demote(const struct sshkey *k, struct sshkey **dkp) struct sshkey *pk; int ret = SSH_ERR_INTERNAL_ERROR; - if (dkp != NULL) - *dkp = NULL; - + *dkp = NULL; if ((pk = calloc(1, sizeof(*pk))) == NULL) return SSH_ERR_ALLOC_FAIL; pk->type = k->type; |