summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:25:23 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:25:23 +0000
commit941ac82e1624e7d7bb7091785ca525889738420b (patch)
treeb00bbaaf325c1832b88b05bb0f0b4ef46b9969b9
parent4030442d77f13f87ecd58d2e43d688b206abb0f4 (diff)
- markus@cvs.openbsd.org 2001/02/28 21:21:41
[sshd.c] generate a fake session id, too
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 71b1a53fe..a2eaf69b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,9 @@
82 - deraadt@cvs.openbsd.org 2001/02/28 17:52:54 82 - deraadt@cvs.openbsd.org 2001/02/28 17:52:54
83 [misc.c] 83 [misc.c]
84 for completeness, copy pw_gecos too 84 for completeness, copy pw_gecos too
85 - markus@cvs.openbsd.org 2001/02/28 21:21:41
86 [sshd.c]
87 generate a fake session id, too
85 88
8620010304 8920010304
87 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 90 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4274,4 +4277,4 @@
4274 - Wrote replacements for strlcpy and mkdtemp 4277 - Wrote replacements for strlcpy and mkdtemp
4275 - Released 1.0pre1 4278 - Released 1.0pre1
4276 4279
4277$Id: ChangeLog,v 1.875 2001/03/05 06:22:01 mouring Exp $ 4280$Id: ChangeLog,v 1.876 2001/03/05 06:25:23 mouring Exp $
diff --git a/sshd.c b/sshd.c
index 2669a935e..2f4cfb6f0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.169 2001/02/23 18:15:13 markus Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.170 2001/02/28 21:21:41 markus Exp $");
44 44
45#include <openssl/dh.h> 45#include <openssl/dh.h>
46#include <openssl/bn.h> 46#include <openssl/bn.h>
@@ -1397,6 +1397,8 @@ do_ssh1_kex(void)
1397 MD5_Final(session_key + 16, &md); 1397 MD5_Final(session_key + 16, &md);
1398 memset(buf, 0, bytes); 1398 memset(buf, 0, bytes);
1399 xfree(buf); 1399 xfree(buf);
1400 for (i = 0; i < 16; i++)
1401 session_id[i] = session_key[i] ^ session_key[i + 16];
1400 } 1402 }
1401 /* Destroy the private and public keys. They will no longer be needed. */ 1403 /* Destroy the private and public keys. They will no longer be needed. */
1402 destroy_sensitive_data(); 1404 destroy_sensitive_data();