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/cipher.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/cipher.c')
| -rw-r--r-- | usr.bin/ssh/cipher.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c index 25ecaa324fa..0ca5e35de2e 100644 --- a/usr.bin/ssh/cipher.c +++ b/usr.bin/ssh/cipher.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.c,v 1.89 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: cipher.c,v 1.90 2013/11/07 11:58:27 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -94,9 +94,9 @@ static const struct Cipher ciphers[] = { /*--*/ -/* Returns a comma-separated list of supported ciphers. */ +/* Returns a list of supported ciphers separated by the specified char. */ char * -cipher_alg_list(void) +cipher_alg_list(char sep) { char *ret = NULL; size_t nlen, rlen = 0; @@ -106,7 +106,7 @@ cipher_alg_list(void) if (c->number != SSH_CIPHER_SSH2) continue; if (ret != NULL) - ret[rlen++] = '\n'; + ret[rlen++] = sep; nlen = strlen(c->name); ret = xrealloc(ret, 1, rlen + nlen + 2); memcpy(ret + rlen, c->name, nlen + 1); |