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 /ssh.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 'ssh.c')
-rw-r--r-- | ssh.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.391 2013/10/25 23:04:51 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.392 2013/11/07 11:58:27 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -520,11 +520,11 @@ main(int ac, char **av) | |||
520 | case 'Q': /* deprecated */ | 520 | case 'Q': /* deprecated */ |
521 | cp = NULL; | 521 | cp = NULL; |
522 | if (strcasecmp(optarg, "cipher") == 0) | 522 | if (strcasecmp(optarg, "cipher") == 0) |
523 | cp = cipher_alg_list(); | 523 | cp = cipher_alg_list('\n'); |
524 | else if (strcasecmp(optarg, "mac") == 0) | 524 | else if (strcasecmp(optarg, "mac") == 0) |
525 | cp = mac_alg_list(); | 525 | cp = mac_alg_list('\n'); |
526 | else if (strcasecmp(optarg, "kex") == 0) | 526 | else if (strcasecmp(optarg, "kex") == 0) |
527 | cp = kex_alg_list(); | 527 | cp = kex_alg_list('\n'); |
528 | else if (strcasecmp(optarg, "key") == 0) | 528 | else if (strcasecmp(optarg, "key") == 0) |
529 | cp = key_alg_list(); | 529 | cp = key_alg_list(); |
530 | if (cp == NULL) | 530 | if (cp == NULL) |