tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: fix exit status for downloading of FIDO resident keys; 

from Pedro Martelletto, ok markus@

OpenBSD-Commit-ID: 0da77dc24a1084798eedd83c39a002a9d231faef
This commit is contained in:
djm@openbsd.org 2020-05-29 03:11:54 +00:00 committed by Damien Miller
parent 1001dd148e
commit 224418cf55
1 changed files with 4 additions and 4 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.411 2020/05/18 04:29:35 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.412 2020/05/29 03:11:54 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
@ -2938,7 +2938,7 @@ do_download_sk(const char *skprovider, const char *device)
{ {
struct sshkey **keys; struct sshkey **keys;
size_t nkeys, i; size_t nkeys, i;
int r, ok = -1; int r, ret = -1;
char *fp, *pin = NULL, *pass = NULL, *path, *pubpath; char *fp, *pin = NULL, *pass = NULL, *path, *pubpath;
const char *ext; const char *ext;
@ -3022,13 +3022,13 @@ do_download_sk(const char *skprovider, const char *device)
} }
if (i >= nkeys) if (i >= nkeys)
ok = 0; /* success */ ret = 0; /* success */
if (pass != NULL) if (pass != NULL)
freezero(pass, strlen(pass)); freezero(pass, strlen(pass));
for (i = 0; i < nkeys; i++) for (i = 0; i < nkeys; i++)
sshkey_free(keys[i]); sshkey_free(keys[i]);
free(keys); free(keys);
return ok ? 0 : -1; return ret;
} }
static void static void