diff options
| author |   dtucker <dtucker@openbsd.org> | 2013-11-07 11:58:27 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2013-11-07 11:58:27 +0000 |
| commit | ceeba42d56c0e4577deabe3c9c739b5800e10ef8 (patch) | |
| tree | 191d84526a59478725b32c7d412fdd5bdeb41da8 /usr.bin/ssh/mac.c | |
| parent | Replace sc_dying in favour of usbd_is_dying() and usbd_deactivate(). (diff) | |
| download | wireguard-openbsd-ceeba42d56c0e4577deabe3c9c739b5800e10ef8.tar.xz wireguard-openbsd-ceeba42d56c0e4577deabe3c9c739b5800e10ef8.zip | |
Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@
Diffstat (limited to 'usr.bin/ssh/mac.c')
| -rw-r--r-- | usr.bin/ssh/mac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c index 63411422819..63cd09b07aa 100644 --- a/usr.bin/ssh/mac.c +++ b/usr.bin/ssh/mac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mac.c,v 1.24 2013/06/03 00:03:18 dtucker Exp $ */ +/* $OpenBSD: mac.c,v 1.25 2013/11/07 11:58:27 dtucker Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -82,9 +82,9 @@ static const struct macalg macs[] = { { NULL, 0, NULL, 0, 0, 0, 0 } }; -/* Returns a comma-separated list of supported MACs. */ +/* Returns a list of supported MACs separated by the specified char. */ char * -mac_alg_list(void) +mac_alg_list(char sep) { char *ret = NULL; size_t nlen, rlen = 0; @@ -92,7 +92,7 @@ mac_alg_list(void) for (m = macs; m->name != NULL; m++) { if (ret != NULL) - ret[rlen++] = '\n'; + ret[rlen++] = sep; nlen = strlen(m->name); ret = xrealloc(ret, 1, rlen + nlen + 2); memcpy(ret + rlen, m->name, nlen + 1); |