summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authordtucker <dtucker>2007-06-05 08:30:18 +0000
committerdtucker <dtucker>2007-06-05 08:30:18 +0000
commit06339f33c40e21a16c81ee4f757cfadf1e6b9524 (patch)
tree721b299d910c7fe152aa4ee4a6cf4c80cdfb1ef0 /kex.c
parente72989d262f2de754b2406a65e4ec6c10c3e2a89 (diff)
downloadopenssh-06339f33c40e21a16c81ee4f757cfadf1e6b9524.tar.gz
- djm@cvs.openbsd.org 2007/06/05 06:52:37
[kex.c monitor_wrap.c packet.c mac.h kex.h mac.c] Preserve MAC ctx between packets, saving 2xhash calls per-packet. Yields around a 12-16% end-to-end speedup for arcfour256/hmac-md5 patch from markus@ tested dtucker@ and myself, ok markus@ and me (I'm committing at his request)
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kex.c b/kex.c
index ad2e93cc..332fadf6 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.78 2007/05/30 05:58:13 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.79 2007/06/05 06:52:37 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
@@ -279,7 +279,7 @@ choose_mac(Mac *mac, char *client, char *server)
if (name == NULL)
fatal("no matching mac found: client %s server %s",
client, server);
- if (mac_init(mac, name) < 0)
+ if (mac_setup(mac, name) < 0)
fatal("unsupported mac %s", name);
/* truncate the key */
if (datafellows & SSH_BUG_HMAC)