diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
commit | 30c3d429306bb4afe71c18db92816b981f7b6d9d (patch) | |
tree | a65f45e0073cb55ad42957a36b4636ff21405108 /myproposal.h | |
parent | 61e50f10c276009bf9472fdd797bf6be60fc2a83 (diff) |
- 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 'myproposal.h')
-rw-r--r-- | myproposal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index 7e4baff9d..8b2417972 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #define KEX_DEFAULT_KEX "diffie-hellman-group1-sha1" | 1 | #define KEX_DEFAULT_KEX "diffie-hellman-group1-sha1" |
2 | #define KEX_DEFAULT_PK_ALG "ssh-dss" | 2 | #define KEX_DEFAULT_PK_ALG "ssh-dss" |
3 | #define KEX_DEFAULT_ENCRYPT "blowfish-cbc,3des-cbc,arcfour,cast128-cbc" | 3 | #define KEX_DEFAULT_ENCRYPT "3des-cbc,blowfish-cbc,arcfour,cast128-cbc" |
4 | #define KEX_DEFAULT_MAC "hmac-sha1,hmac-md5,hmac-ripemd160@openssh.com" | 4 | #define KEX_DEFAULT_MAC "hmac-sha1,hmac-md5,hmac-ripemd160@openssh.com" |
5 | #define KEX_DEFAULT_COMP "zlib,none" | 5 | #define KEX_DEFAULT_COMP "zlib,none" |
6 | #define KEX_DEFAULT_LANG "" | 6 | #define KEX_DEFAULT_LANG "" |