diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2004-05-13 08:30:44 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2004-05-13 08:30:44 +0200 |
| commit | e14e005f41cf541017ab4e285f0b2ec23a21b7ff (patch) | |
| tree | dc39d17aec412258454cf026c2c3e27cf1b45411 /sshconnect1.c | |
| parent | - djm@cvs.openbsd.org 2004/05/09 00:06:47 (diff) | |
| download | openssh-e14e005f41cf541017ab4e285f0b2ec23a21b7ff.tar.xz openssh-e14e005f41cf541017ab4e285f0b2ec23a21b7ff.zip | |
- djm@cvs.openbsd.org 2004/05/09 01:19:28
[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@
Diffstat (limited to 'sshconnect1.c')
| -rw-r--r-- | sshconnect1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect1.c b/sshconnect1.c index c579b01cc..ae33ab39d 100644 --- a/sshconnect1.c +++ b/sshconnect1.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect1.c,v 1.57 2004/05/08 00:21:31 djm Exp $"); +RCSID("$OpenBSD: sshconnect1.c,v 1.58 2004/05/09 01:19:28 djm Exp $"); #include <openssl/bn.h> #include <openssl/md5.h> @@ -24,7 +24,7 @@ RCSID("$OpenBSD: sshconnect1.c,v 1.57 2004/05/08 00:21:31 djm Exp $"); #include "rsa.h" #include "buffer.h" #include "packet.h" -#include "mpaux.h" +#include "kex.h" #include "uidswap.h" #include "log.h" #include "readconf.h" @@ -528,7 +528,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr) client_flags = SSH_PROTOFLAG_SCREEN_NUMBER | SSH_PROTOFLAG_HOST_IN_FWD_OPEN; - compute_session_id(session_id, cookie, host_key->rsa->n, server_key->rsa->n); + derive_ssh1_session_id(host_key->rsa->n, server_key->rsa->n, cookie, session_id); /* Generate a session key. */ arc4random_stir(); |