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/ssh.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/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 71aec4c65e3..3e06647229e 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.391 2013/10/25 23:04:51 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.392 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 @@ -492,11 +492,11 @@ main(int ac, char **av) case 'Q': /* deprecated */ cp = NULL; if (strcasecmp(optarg, "cipher") == 0) - cp = cipher_alg_list(); + cp = cipher_alg_list('\n'); else if (strcasecmp(optarg, "mac") == 0) - cp = mac_alg_list(); + cp = mac_alg_list('\n'); else if (strcasecmp(optarg, "kex") == 0) - cp = kex_alg_list(); + cp = kex_alg_list('\n'); else if (strcasecmp(optarg, "key") == 0) cp = key_alg_list(); if (cp == NULL) |