summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-07-17 16:12:08 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-07-17 16:12:08 +1000
commitfc9597034b819b295966f61d8dc797b53fda45c7 (patch)
treea5a9b7afc50720d7b6f89a4ae1f211abbff89f47 /sshd.c
parentba6de952a00558e6d93b8c9edd81806a99716411 (diff)
- deraadt@cvs.openbsd.org 2004/07/11 17:48:47
[channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h sshd.c ttymodes.h] spaces
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshd.c b/sshd.c
index 6df8f252a..ac62cb506 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.297 2004/06/26 20:07:16 avsm Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.298 2004/07/11 17:48:47 deraadt Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -803,7 +803,7 @@ send_rexec_state(int fd, Buffer *conf)
803 buffer_init(&m); 803 buffer_init(&m);
804 buffer_put_cstring(&m, buffer_ptr(conf)); 804 buffer_put_cstring(&m, buffer_ptr(conf));
805 805
806 if (sensitive_data.server_key != NULL && 806 if (sensitive_data.server_key != NULL &&
807 sensitive_data.server_key->type == KEY_RSA1) { 807 sensitive_data.server_key->type == KEY_RSA1) {
808 buffer_put_int(&m, 1); 808 buffer_put_int(&m, 1);
809 buffer_put_bignum(&m, sensitive_data.server_key->rsa->e); 809 buffer_put_bignum(&m, sensitive_data.server_key->rsa->e);
@@ -1896,7 +1896,7 @@ do_ssh1_kex(void)
1896 session_key + sizeof(session_key) - len); 1896 session_key + sizeof(session_key) - len);
1897 1897
1898 derive_ssh1_session_id( 1898 derive_ssh1_session_id(
1899 sensitive_data.ssh1_host_key->rsa->n, 1899 sensitive_data.ssh1_host_key->rsa->n,
1900 sensitive_data.server_key->rsa->n, 1900 sensitive_data.server_key->rsa->n,
1901 cookie, session_id); 1901 cookie, session_id);
1902 /* 1902 /*