diff options
| author |   markus <markus@openbsd.org> | 2000-10-11 20:27:23 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2000-10-11 20:27:23 +0000 |
| commit | 8612b276e433abfd30b3a388e2889f83f46ecdaa (patch) | |
| tree | 3c7eb5dcc0097a3d2a0ab5a6139fb991e30a25c4 /usr.bin/ssh/ssh.c | |
| parent | add support for s/key (kbd-interactive) to ssh2, based on work by mkiernan@avantgo.com and me (diff) | |
| download | wireguard-openbsd-8612b276e433abfd30b3a388e2889f83f46ecdaa.tar.xz wireguard-openbsd-8612b276e433abfd30b3a388e2889f83f46ecdaa.zip | |
new cipher framework
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index e2a399945aa..a915b57cd2a 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.67 2000/10/03 18:16:47 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.68 2000/10/11 20:27:24 markus Exp $"); #include <openssl/evp.h> #include <openssl/dsa.h> @@ -404,11 +404,12 @@ main(int ac, char **av) options.cipher = SSH_CIPHER_ILLEGAL; } else { /* SSH1 only */ - options.cipher = cipher_number(optarg); - if (options.cipher == -1) { + Cipher *c = cipher_by_name(optarg); + if (c == NULL || c->number < 0) { fprintf(stderr, "Unknown cipher type '%s'\n", optarg); exit(1); } + options.cipher = c->number; } break; case 'p': |