diff options
| author | Damien Miller <djm@mindrot.org> | 2000-05-09 03:02:59 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-05-09 03:02:59 +0200 |
| commit | 30c3d429306bb4afe71c18db92816b981f7b6d9d (patch) | |
| tree | a65f45e0073cb55ad42957a36b4636ff21405108 /ssh.c | |
| parent | - Configure caching and cleanup patch from Andre Lucas' (diff) | |
| download | openssh-30c3d429306bb4afe71c18db92816b981f7b6d9d.tar.xz openssh-30c3d429306bb4afe71c18db92816b981f7b6d9d.zip | |
- OpenBSD CVS update
- markus@cvs.openbsd.org
[cipher.h myproposal.h readconf.c readconf.h servconf.c ssh.1 ssh.c]
[ssh.h sshconnect1.c sshconnect2.c sshd.8]
- complain about invalid ciphers in SSH1 (e.g. arcfour is SSH2 only)
- hugh@cvs.openbsd.org
[ssh.1]
- zap typo
[ssh-keygen.1]
- One last nit fix. (markus approved)
[sshd.8]
- some markus certified spelling adjustments
- markus@cvs.openbsd.org
[auth2.c channels.c clientloop.c compat compat.h dsa.c kex.c]
[sshconnect2.c ]
- bug compat w/ ssh-2.0.13 x11, split out bugs
[nchan.c]
- no drain if ibuf_empty, fixes x11fwd problems; tests by fries@
[ssh-keygen.c]
- handle escapes in real and original key format, ok millert@
[version.h]
- OpenSSH-2.1
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.29 2000/05/01 10:59:51 damien Exp $"); +RCSID("$Id: ssh.c,v 1.30 2000/05/09 01:03:02 damien Exp $"); #include <openssl/evp.h> #include <openssl/dsa.h> @@ -367,6 +367,7 @@ main(int ac, char **av) if (ciphers_valid(optarg)) { /* SSH2 only */ options.ciphers = xstrdup(optarg); + options.cipher = SSH_CIPHER_ILLEGAL; } else { /* SSH1 only */ options.cipher = cipher_number(optarg); |