summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keygen.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2020-05-29 03:11:54 +0000
committerdjm <djm@openbsd.org>2020-05-29 03:11:54 +0000
commit530e9d472f86b4e9f4da1de6a9f6c59957487445 (patch)
tree43dbb7e4ffa500dae378755b62853f7f4aee4157 /usr.bin/ssh/ssh-keygen.c
parentfix "STYLE: whitespace at end of input line" (diff)
downloadwireguard-openbsd-530e9d472f86b4e9f4da1de6a9f6c59957487445.tar.xz
wireguard-openbsd-530e9d472f86b4e9f4da1de6a9f6c59957487445.zip
fix exit status for downloading of FIDO resident keys; from
Pedro Martelletto, ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
-rw-r--r--usr.bin/ssh/ssh-keygen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 5668a4fd35c..c1e307566e3 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -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>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2916,7 +2916,7 @@ do_download_sk(const char *skprovider, const char *device)
{
struct sshkey **keys;
size_t nkeys, i;
- int r, ok = -1;
+ int r, ret = -1;
char *fp, *pin = NULL, *pass = NULL, *path, *pubpath;
const char *ext;
@@ -3000,13 +3000,13 @@ do_download_sk(const char *skprovider, const char *device)
}
if (i >= nkeys)
- ok = 0; /* success */
+ ret = 0; /* success */
if (pass != NULL)
freezero(pass, strlen(pass));
for (i = 0; i < nkeys; i++)
sshkey_free(keys[i]);
free(keys);
- return ok ? 0 : -1;
+ return ret;
}
static void