diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-10-15 23:08:23 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-10-16 10:54:07 +1100 |
| commit | 1a2663a15d356bb188196b6414b4c50dc12fd42b (patch) | |
| tree | 35fef18d80d38f5487989c9887ae639390fb2a3e /sshkey.c | |
| parent | 0f754e29dd3760fc0b172c1220f18b753fb0957e (diff) | |
upstream commit
argument to sshkey_from_private() and sshkey_demote()
can't be NULL
Upstream-ID: 0111245b1641d387977a9b38da15916820a5fd1f
Diffstat (limited to 'sshkey.c')
| -rw-r--r-- | sshkey.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -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. @@ -1758,9 +1758,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: @@ -2243,9 +2241,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; |