summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-04-30 23:15:04 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 10:04:58 +1000
commitcdccebdf85204bf7542b7fcc1aa2ea3f36661833 (patch)
treefd07acdcdebd7da5dc027e58261a446a807466ba /ssh.c
parent97f4d3083b036ce3e68d6346a6140a22123d5864 (diff)
upstream commit
remove SSHv1 ciphers; ok markus@ Upstream-ID: e5ebc5e540d7f23a8c1266db1839794d4d177890
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/ssh.c b/ssh.c
index a682ce91..c1316f44 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.455 2017/04/30 23:13:25 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.456 2017/04/30 23:15:04 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -813,27 +813,14 @@ main(int ac, char **av)
}
break;
case 'c':
- if (ciphers_valid(*optarg == '+' ?
+ if (!ciphers_valid(*optarg == '+' ?
optarg + 1 : optarg)) {
- /* SSH2 only */
- free(options.ciphers);
- options.ciphers = xstrdup(optarg);
- options.cipher = SSH_CIPHER_INVALID;
- break;
- }
- /* SSH1 only */
- options.cipher = cipher_number(optarg);
- if (options.cipher == -1) {
fprintf(stderr, "Unknown cipher type '%s'\n",
optarg);
exit(255);
}
- if (options.cipher == SSH_CIPHER_3DES)
- options.ciphers = xstrdup("3des-cbc");
- else if (options.cipher == SSH_CIPHER_BLOWFISH)
- options.ciphers = xstrdup("blowfish-cbc");
- else
- options.ciphers = xstrdup(KEX_CLIENT_ENCRYPT);
+ free(options.ciphers);
+ options.ciphers = xstrdup(optarg);
break;
case 'm':
if (mac_valid(optarg)) {