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 /kex.c | |
| 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 'kex.c')
| -rw-r--r-- | kex.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -28,7 +28,7 @@ */ #include "includes.h" -RCSID("$Id: kex.c,v 1.7 2000/04/16 01:52:47 damien Exp $"); +RCSID("$Id: kex.c,v 1.8 2000/05/09 01:03:01 damien Exp $"); #include "ssh.h" #include "ssh2.h" @@ -314,7 +314,7 @@ choose_mac(Mac *mac, char *client, char *server) } mac->name = name; mac->mac_len = mac->md->md_size; - mac->key_len = datafellows ? 16 : mac->mac_len; + mac->key_len = (datafellows & SSH_BUG_HMAC) ? 16 : mac->mac_len; mac->key = NULL; mac->enabled = 0; } |