summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/kex.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-05-08 17:42:26 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-05-08 17:42:26 +0000
commit526b62b23a3b72fcd66bf7a62813b1b6da8ac37c (patch)
tree9586383b485bb48dd5d44eea6b61629a81b7b31c /usr.bin/ssh/kex.c
parentf7301706b5e29a6c91ae723c78392a652f52caf2 (diff)
bug compat w/ ssh-2.0.13 x11, split out bugs
Diffstat (limited to 'usr.bin/ssh/kex.c')
-rw-r--r--usr.bin/ssh/kex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c
index 4b55c074859..c10c77ead60 100644
--- a/usr.bin/ssh/kex.c
+++ b/usr.bin/ssh/kex.c
@@ -28,7 +28,7 @@
*/
#include "includes.h"
-RCSID("$Id: kex.c,v 1.5 2000/04/14 10:30:31 markus Exp $");
+RCSID("$Id: kex.c,v 1.6 2000/05/08 17:42:25 markus 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;
}