need dispatch-callbacks, since application data is delayed until
the keyexchange completes (if i understand the drafts correctly).
add some infrastructure for re-keying.
+ - markus@cvs.openbsd.org 2001/04/04 00:06:54
+ [clientloop.c sshconnect2.c]
+ enable client rekeying
+ (1) force rekeying with ~R, or
+ (2) if the server requests rekeying.
+ works against ssh-2.0.12/2.0.13/2.1.0/2.2.0/2.3.0/2.3.1/2.4.0
20010403
- OpenBSD CVS Sync
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.53 2001/03/06 01:08:27 millert Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.54 2001/04/04 00:06:53 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
#include "buffer.h"
#include "bufaux.h"
#include "key.h"
+#include "kex.h"
#include "log.h"
#include "readconf.h"
#include "clientloop.h"
void client_init_dispatch(void);
int session_ident = -1;
+/*XXX*/
+extern Kex *xxx_kex;
+
/* Returns the user\'s terminal to normal mode if it had been put in raw mode. */
void
/* We have been continued. */
continue;
+ case 'R':
+ debug("Rekeying");
+ kex_send_kexinit(xxx_kex);
+ continue;
+
case '&':
/* XXX does not work yet with proto 2 */
if (compat20)
void
client_process_buffered_input_packets(void)
{
- dispatch_run(DISPATCH_NONBLOCK, &quit_pending, NULL);
+ dispatch_run(DISPATCH_NONBLOCK, &quit_pending, compat20 ? xxx_kex : NULL);
}
/* scan buf[] for '~' before sending data to the peer */
void
client_init_dispatch_20(void)
{
- dispatch_init(&dispatch_protocol_error);
+ int i;
+ /* dispatch_init(&dispatch_protocol_error); */
+ for (i = 50; i <= 254; i++)
+ dispatch_set(i, &dispatch_protocol_error);
dispatch_set(SSH2_MSG_CHANNEL_CLOSE, &channel_input_oclose);
dispatch_set(SSH2_MSG_CHANNEL_DATA, &channel_input_data);
dispatch_set(SSH2_MSG_CHANNEL_EOF, &channel_input_ieof);
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.62 2001/04/03 23:32:12 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.63 2001/04/04 00:06:54 markus Exp $");
#include <openssl/bn.h>
#include <openssl/md5.h>
char *xxx_host;
struct sockaddr *xxx_hostaddr;
+Kex *xxx_kex = NULL;
+
int
check_host_key_callback(Key *hostkey)
{
kex->server_version_string=server_version_string;
kex->check_host_key=&check_host_key_callback;
+ xxx_kex = kex;
+
/* start key exchange */
dispatch_run(DISPATCH_BLOCK, &kex->newkeys, kex);