diff options
| author |   djm <djm@openbsd.org> | 2016-09-12 23:31:27 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-09-12 23:31:27 +0000 |
| commit | 81a19b1673b3288c6e55ef3fec32b943592abf6b (patch) | |
| tree | a02bd9dfe772476063ece679b5e5493223a78a92 /usr.bin/ssh/sshkey.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-81a19b1673b3288c6e55ef3fec32b943592abf6b.tar.xz wireguard-openbsd-81a19b1673b3288c6e55ef3fec32b943592abf6b.zip | |
list all supported signature algorithms in the server-sig-algs
Reported by mb AT smartftp.com in bz#2547 and (independantly)
Ron Frederick; ok markus@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 4208b8d6a31..9db78ea16f0 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.37 2016/09/12 01:22:38 deraadt Exp $ */ +/* $OpenBSD: sshkey.c,v 1.38 2016/09/12 23:31:27 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -183,7 +183,7 @@ sshkey_ecdsa_nid_from_name(const char *name) } char * -key_alg_list(int certs_only, int plain_only) +sshkey_alg_list(int certs_only, int plain_only, char sep) { char *tmp, *ret = NULL; size_t nlen, rlen = 0; @@ -195,7 +195,7 @@ key_alg_list(int certs_only, int plain_only) if ((certs_only && !kt->cert) || (plain_only && kt->cert)) continue; if (ret != NULL) - ret[rlen++] = '\n'; + ret[rlen++] = sep; nlen = strlen(kt->name); if ((tmp = realloc(ret, rlen + nlen + 2)) == NULL) { free(ret); |