summaryrefslogtreecommitdiff
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 582632af3..83594e4a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
24 [OVERVIEW auth-rsa.c auth1.c kex.c monitor.c session.c sshconnect1.c 24 [OVERVIEW auth-rsa.c auth1.c kex.c monitor.c session.c sshconnect1.c
25 sshd.c] removed: mpaux.c mpaux.h 25 sshd.c] removed: mpaux.c mpaux.h
26 kill some more tiny files; ok deraadt@ 26 kill some more tiny files; ok deraadt@
27 - djm@cvs.openbsd.org 2004/05/09 01:26:48
28 [kex.c]
29 don't overwrite what we are trying to compute
27 30
2820040502 3120040502
29 - (dtucker) OpenBSD CVS Sync 32 - (dtucker) OpenBSD CVS Sync
@@ -1100,4 +1103,4 @@
1100 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1103 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1101 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1104 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1102 1105
1103$Id: ChangeLog,v 1.3348 2004/05/13 06:30:44 dtucker Exp $ 1106$Id: ChangeLog,v 1.3349 2004/05/13 06:31:48 dtucker Exp $
diff --git a/kex.c b/kex.c
index 30dd58a78..fa5de7ed8 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: kex.c,v 1.57 2004/05/09 01:19:27 djm Exp $"); 26RCSID("$OpenBSD: kex.c,v 1.58 2004/05/09 01:26:48 djm Exp $");
27 27
28#include <openssl/crypto.h> 28#include <openssl/crypto.h>
29 29
@@ -504,7 +504,7 @@ derive_ssh1_session_id(BIGNUM *host_modulus, BIGNUM *server_modulus,
504 504
505 EVP_DigestUpdate(&md, cookie, 8); 505 EVP_DigestUpdate(&md, cookie, 8);
506 506
507 EVP_DigestFinal(&md, id, NULL); 507 EVP_DigestFinal(&md, obuf, NULL);
508 memcpy(id, obuf, 16); 508 memcpy(id, obuf, 16);
509 509
510 memset(nbuf, 0, sizeof(nbuf)); 510 memset(nbuf, 0, sizeof(nbuf));