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 /cipher.c | |
| parent | 08998c5fb9c7c1d248caa73b76e02ca0482e6d85 (diff) | |
| download | openssh-git-690d989008e18af3603a5e03f1276c9bad090370.tar.gz | |
- 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 'cipher.c')
| -rw-r--r-- | cipher.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 @@ -100,9 +100,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; @@ -112,7 +112,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); |