diff options
Diffstat (limited to 'sshkey.c')
-rw-r--r-- | sshkey.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.44 2017/03/10 03:48:57 dtucker Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.45 2017/03/10 04:07:20 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -197,14 +197,16 @@ sshkey_ecdsa_nid_from_name(const char *name) | |||
197 | } | 197 | } |
198 | 198 | ||
199 | char * | 199 | char * |
200 | sshkey_alg_list(int certs_only, int plain_only, char sep) | 200 | sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep) |
201 | { | 201 | { |
202 | char *tmp, *ret = NULL; | 202 | char *tmp, *ret = NULL; |
203 | size_t nlen, rlen = 0; | 203 | size_t nlen, rlen = 0; |
204 | const struct keytype *kt; | 204 | const struct keytype *kt; |
205 | 205 | ||
206 | for (kt = keytypes; kt->type != -1; kt++) { | 206 | for (kt = keytypes; kt->type != -1; kt++) { |
207 | if (kt->name == NULL || kt->sigonly) | 207 | if (kt->name == NULL) |
208 | continue; | ||
209 | if (!include_sigonly && kt->sigonly) | ||
208 | continue; | 210 | continue; |
209 | if ((certs_only && !kt->cert) || (plain_only && kt->cert)) | 211 | if ((certs_only && !kt->cert) || (plain_only && kt->cert)) |
210 | continue; | 212 | continue; |