summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--kex.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 582632af..83594e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
[OVERVIEW auth-rsa.c auth1.c kex.c monitor.c session.c sshconnect1.c
sshd.c] removed: mpaux.c mpaux.h
kill some more tiny files; ok deraadt@
+ - djm@cvs.openbsd.org 2004/05/09 01:26:48
+ [kex.c]
+ don't overwrite what we are trying to compute
20040502
- (dtucker) OpenBSD CVS Sync
@@ -1100,4 +1103,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3348 2004/05/13 06:30:44 dtucker Exp $
+$Id: ChangeLog,v 1.3349 2004/05/13 06:31:48 dtucker Exp $
diff --git a/kex.c b/kex.c
index 30dd58a7..fa5de7ed 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.57 2004/05/09 01:19:27 djm Exp $");
+RCSID("$OpenBSD: kex.c,v 1.58 2004/05/09 01:26:48 djm Exp $");
#include <openssl/crypto.h>
@@ -504,7 +504,7 @@ derive_ssh1_session_id(BIGNUM *host_modulus, BIGNUM *server_modulus,
EVP_DigestUpdate(&md, cookie, 8);
- EVP_DigestFinal(&md, id, NULL);
+ EVP_DigestFinal(&md, obuf, NULL);
memcpy(id, obuf, 16);
memset(nbuf, 0, sizeof(nbuf));