From 130f5df4fa37cace8c079dccb690e5cafbf00751 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Mon, 12 Sep 2016 23:31:27 +0000 Subject: upstream commit 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@ Upstream-ID: ddf702d721f54646b11ef2cee6d916666cb685cd --- sshkey.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sshkey.c') diff --git a/sshkey.c b/sshkey.c index 8f6173e27..e6df94aaa 100644 --- a/sshkey.c +++ b/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. @@ -195,7 +195,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; @@ -207,7 +207,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); -- cgit v1.2.3