summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2002-03-19 21:12:49 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2002-03-19 21:12:49 +0000
commitab19372b556f5725cda99f78f7f4302f476368ad (patch)
tree85cb5ecfe764fdf832f32dbb9ddf1836cbe186b4 /usr.bin/ssh
parent3ca239522a6fa9f21b32d2be0175f30d23d46697 (diff)
use SSH_SESSION_KEY_LENGTH for key length
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/monitor.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index 6c70d2ebdb9..16f1912e666 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/monitor.c
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.4 2002/03/19 14:27:39 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.5 2002/03/19 21:12:48 markus Exp $");
#include <openssl/dh.h>
@@ -1144,7 +1144,6 @@ mm_answer_rsa_challenge(int socket, Buffer *m)
debug3("%s sending reply", __FUNCTION__);
mm_request_send(socket, MONITOR_ANS_RSACHALLENGE, m);
-
monitor_permit(mon_dispatch, MONITOR_REQ_RSARESPONSE, 1);
return (0);
}
@@ -1220,7 +1219,9 @@ monitor_apply_keystate(struct monitor *monitor)
set_newkeys(MODE_IN);
set_newkeys(MODE_OUT);
} else {
- u_char key[256];
+ u_char key[SSH_SESSION_KEY_LENGTH];
+
+ memset(key, 'a', sizeof(key));
packet_set_protocol_flags(child_state.ssh1protoflags);
packet_set_encryption_key(key, SSH_SESSION_KEY_LENGTH,
child_state.ssh1cipher);