if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) \
fprintf(stderr, "%s\n", s); }
-#define bombout(msg) ( ssh_state == SSH_STATE_CLOSED, closesocket(s), \
+#define bombout(msg) ( ssh_state = SSH_STATE_CLOSED, closesocket(s), \
s = INVALID_SOCKET, connection_fatal msg )
#define SSH1_MSG_DISCONNECT 1 /* 0x1 */
extern const struct ssh_hostkey ssh_dss;
const static struct ssh_hostkey *hostkey_algs[] = { &ssh_dss };
-extern const struct ssh_mac ssh_sha1, ssh_sha1_buggy;
+extern const struct ssh_mac ssh_md5, ssh_sha1, ssh_sha1_buggy;
static void nullmac_key(unsigned char *key) { }
static void nullmac_generate(unsigned char *blk, int len, unsigned long seq) { }
const static struct ssh_mac ssh_mac_none = {
nullmac_key, nullmac_key, nullmac_generate, nullmac_verify, "none", 0
};
-const static struct ssh_mac *macs[] = { &ssh_sha1, &ssh_mac_none };
-const static struct ssh_mac *buggymacs[] = { &ssh_sha1_buggy, &ssh_mac_none };
+const static struct ssh_mac *macs[] = {
+ &ssh_sha1, &ssh_md5, &ssh_mac_none };
+const static struct ssh_mac *buggymacs[] = {
+ &ssh_sha1_buggy, &ssh_md5, &ssh_mac_none };
const static struct ssh_compress ssh_comp_none = {
"none"
if (cipher)
cipher->decrypt(pktin.data, st->biglen);
+#if 0
+ debug(("Got packet len=%d pad=%d\r\n", st->len, st->pad));
+ for (st->i = 0; st->i < st->biglen; st->i++)
+ debug((" %02x", (unsigned char)pktin.data[st->i]));
+ debug(("\r\n"));
+#endif
pktin.type = pktin.data[st->pad];
pktin.body = pktin.data + st->pad + 1;
PUT_32BIT(pktout.data+biglen, crc);
PUT_32BIT(pktout.data, len);
+#if 0
+ debug(("Sending packet len=%d\r\n", biglen+4));
+ for (i = 0; i < biglen+4; i++)
+ debug((" %02x", (unsigned char)pktout.data[i]));
+ debug(("\r\n"));
+#endif
if (cipher)
cipher->encrypt(pktout.data+4, biglen);
static unsigned char buffer[32];
tried_publickey = 1;
- i = loadrsakey(cfg.keyfile, &pubkey, password);
+ i = loadrsakey(cfg.keyfile, &pubkey, NULL, password);
if (i == 0) {
c_write("Couldn't load public key from ", 30);
c_write(cfg.keyfile, strlen(cfg.keyfile));
static char *str;
static Bignum e, f, K;
static const struct ssh_mac **maclist;
+ static int nmacs;
static const struct ssh_cipher *cscipher_tobe = NULL;
static const struct ssh_cipher *sccipher_tobe = NULL;
static const struct ssh_mac *csmac_tobe = NULL;
* Be prepared to work around the buggy MAC problem.
*/
if (cfg.buggymac)
- maclist = buggymacs;
+ maclist = buggymacs, nmacs = lenof(buggymacs);
else
- maclist = macs;
+ maclist = macs, nmacs = lenof(macs);
begin_key_exchange:
/*
}
/* List client->server MAC algorithms. */
ssh2_pkt_addstring_start();
- for (i = 0; i < lenof(maclist); i++) {
+ for (i = 0; i < nmacs; i++) {
ssh2_pkt_addstring_str(maclist[i]->name);
- if (i < lenof(maclist)-1)
+ if (i < nmacs-1)
ssh2_pkt_addstring_str(",");
}
/* List server->client MAC algorithms. */
ssh2_pkt_addstring_start();
- for (i = 0; i < lenof(maclist); i++) {
+ for (i = 0; i < nmacs; i++) {
ssh2_pkt_addstring_str(maclist[i]->name);
- if (i < lenof(maclist)-1)
+ if (i < nmacs-1)
ssh2_pkt_addstring_str(",");
}
/* List client->server compression algorithms. */
}
}
ssh2_pkt_getstring(&str, &len); /* client->server mac */
- for (i = 0; i < lenof(maclist); i++) {
+ for (i = 0; i < nmacs; i++) {
if (in_commasep_string(maclist[i]->name, str, len)) {
csmac_tobe = maclist[i];
break;
}
}
ssh2_pkt_getstring(&str, &len); /* server->client mac */
- for (i = 0; i < lenof(maclist); i++) {
+ for (i = 0; i < nmacs; i++) {
if (in_commasep_string(maclist[i]->name, str, len)) {
scmac_tobe = maclist[i];
break;
ssh2_pkt_init(SSH2_MSG_CHANNEL_OPEN);
ssh2_pkt_addstring("session");
ssh2_pkt_adduint32(mainchan->localid);
- ssh2_pkt_adduint32(0x7FFFFFFFUL); /* our window size */
+ ssh2_pkt_adduint32(0x8000UL); /* our window size */
ssh2_pkt_adduint32(0x4000UL); /* our max pkt size */
ssh2_pkt_send();
crWaitUntilV(ispkt);
logevent("All channels closed. Disconnecting");
ssh2_pkt_init(SSH2_MSG_DISCONNECT);
ssh2_pkt_send();
+ ssh_state = SSH_STATE_CLOSED;
+ closesocket(s);
+ s = INVALID_SOCKET;
}
continue; /* remote sends close; ignore (FIXME) */
} else if (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST) {