summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sshd.c b/sshd.c
index 634284251..696978f00 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.290 2004/03/11 10:21:17 markus Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.291 2004/05/09 01:19:28 djm Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -60,7 +60,6 @@ RCSID("$OpenBSD: sshd.c,v 1.290 2004/03/11 10:21:17 markus Exp $");
60#include "rsa.h" 60#include "rsa.h"
61#include "sshpty.h" 61#include "sshpty.h"
62#include "packet.h" 62#include "packet.h"
63#include "mpaux.h"
64#include "log.h" 63#include "log.h"
65#include "servconf.h" 64#include "servconf.h"
66#include "uidswap.h" 65#include "uidswap.h"
@@ -1689,9 +1688,10 @@ do_ssh1_kex(void)
1689 BN_bn2bin(session_key_int, 1688 BN_bn2bin(session_key_int,
1690 session_key + sizeof(session_key) - len); 1689 session_key + sizeof(session_key) - len);
1691 1690
1692 compute_session_id(session_id, cookie, 1691 derive_ssh1_session_id(
1693 sensitive_data.ssh1_host_key->rsa->n, 1692 sensitive_data.ssh1_host_key->rsa->n,
1694 sensitive_data.server_key->rsa->n); 1693 sensitive_data.server_key->rsa->n,
1694 cookie, session_id);
1695 /* 1695 /*
1696 * Xor the first 16 bytes of the session key with the 1696 * Xor the first 16 bytes of the session key with the
1697 * session id. 1697 * session id.