tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: avoid possible NULL deref; from Pedro Martelletto

Browse Source 
OpenBSD-Commit-ID: e6099c3fbb70aa67eb106e84d8b43f1fa919b721
This commit is contained in:
djm@openbsd.org 2020-05-18 04:29:35 +00:00 committed by Damien Miller
parent 4b307faf2f
commit 2a63ce5cd6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.410 2020/05/13 09:55:57 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.411 2020/05/18 04:29:35 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2954,14 +2954,16 @@ do_download_sk(const char *skprovider, const char *device)
&keys, &nkeys)) != 0) { &keys, &nkeys)) != 0) {
if (i == 0 && r == SSH_ERR_KEY_WRONG_PASSPHRASE) if (i == 0 && r == SSH_ERR_KEY_WRONG_PASSPHRASE)
continue; continue;
freezero(pin, strlen(pin)); if (pin != NULL)
freezero(pin, strlen(pin));
error("Unable to load resident keys: %s", ssh_err(r)); error("Unable to load resident keys: %s", ssh_err(r));
return -1; return -1;
} }
} }
if (nkeys == 0) if (nkeys == 0)
logit("No keys to download"); logit("No keys to download");
freezero(pin, strlen(pin)); if (pin != NULL)
freezero(pin, strlen(pin));
for (i = 0; i < nkeys; i++) { for (i = 0; i < nkeys; i++) {
if (keys[i]->type != KEY_ECDSA_SK && if (keys[i]->type != KEY_ECDSA_SK &&