diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-08 12:16:49 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-08 12:16:49 +1100 |
commit | 690d989008e18af3603a5e03f1276c9bad090370 (patch) | |
tree | 60dc95d5ad849ee6600da56ac4635b42740aad60 /kex.c | |
parent | 08998c5fb9c7c1d248caa73b76e02ca0482e6d85 (diff) |
- dtucker@cvs.openbsd.org 2013/11/07 11:58:27
[cipher.c cipher.h kex.c kex.h mac.c mac.h servconf.c ssh.c]
Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.92 2013/11/02 21:59:15 markus Exp $ */ +/* $OpenBSD: kex.c,v 1.93 2013/11/07 11:58:27 dtucker Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -85,7 +85,7 @@ static const struct kexalg kexalgs[] = { }; char * -kex_alg_list(void) +kex_alg_list(char sep) { char *ret = NULL; size_t nlen, rlen = 0; @@ -93,7 +93,7 @@ kex_alg_list(void) for (k = kexalgs; k->name != NULL; k++) { if (ret != NULL) - ret[rlen++] = '\n'; + ret[rlen++] = sep; nlen = strlen(k->name); ret = xrealloc(ret, 1, rlen + nlen + 2); memcpy(ret + rlen, k->name, nlen + 1); |