X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/18515c513c3a2ee62fccc81fd08f4a65ec208eb9..fe50e8140a2dbb3ba357a0ab777f34e07d568c23:/ssh.c diff --git a/ssh.c b/ssh.c index 41d0cf02..c065f2f8 100644 --- a/ssh.c +++ b/ssh.c @@ -2,11 +2,17 @@ #include #include #include +#ifndef AUTO_WINSOCK +#ifdef WINSOCK_TWO +#include +#else #include +#endif +#endif #include "putty.h" +#include "tree234.h" #include "ssh.h" -#include "scp.h" #ifndef FALSE #define FALSE 0 @@ -16,77 +22,97 @@ #endif #define logevent(s) { logevent(s); \ - if (!(flags & FLAG_CONNECTION) && (flags & FLAG_VERBOSE)) \ + if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) \ fprintf(stderr, "%s\n", s); } -#define SSH1_MSG_DISCONNECT 1 -#define SSH1_SMSG_PUBLIC_KEY 2 -#define SSH1_CMSG_SESSION_KEY 3 -#define SSH1_CMSG_USER 4 -#define SSH1_CMSG_AUTH_RSA 6 -#define SSH1_SMSG_AUTH_RSA_CHALLENGE 7 -#define SSH1_CMSG_AUTH_RSA_RESPONSE 8 -#define SSH1_CMSG_AUTH_PASSWORD 9 -#define SSH1_CMSG_REQUEST_PTY 10 -#define SSH1_CMSG_WINDOW_SIZE 11 -#define SSH1_CMSG_EXEC_SHELL 12 -#define SSH1_CMSG_EXEC_CMD 13 -#define SSH1_SMSG_SUCCESS 14 -#define SSH1_SMSG_FAILURE 15 -#define SSH1_CMSG_STDIN_DATA 16 -#define SSH1_SMSG_STDOUT_DATA 17 -#define SSH1_SMSG_STDERR_DATA 18 -#define SSH1_CMSG_EOF 19 -#define SSH1_SMSG_EXIT_STATUS 20 -#define SSH1_CMSG_EXIT_CONFIRMATION 33 -#define SSH1_MSG_IGNORE 32 -#define SSH1_MSG_DEBUG 36 -#define SSH1_CMSG_AUTH_TIS 39 -#define SSH1_SMSG_AUTH_TIS_CHALLENGE 40 -#define SSH1_CMSG_AUTH_TIS_RESPONSE 41 -#define SSH1_CMSG_AUTH_CCARD 70 -#define SSH1_SMSG_AUTH_CCARD_CHALLENGE 71 -#define SSH1_CMSG_AUTH_CCARD_RESPONSE 72 - -#define SSH1_AUTH_TIS 5 -#define SSH1_AUTH_CCARD 16 - -#define SSH2_MSG_DISCONNECT 1 -#define SSH2_MSG_IGNORE 2 -#define SSH2_MSG_UNIMPLEMENTED 3 -#define SSH2_MSG_DEBUG 4 -#define SSH2_MSG_SERVICE_REQUEST 5 -#define SSH2_MSG_SERVICE_ACCEPT 6 -#define SSH2_MSG_KEXINIT 20 -#define SSH2_MSG_NEWKEYS 21 -#define SSH2_MSG_KEXDH_INIT 30 -#define SSH2_MSG_KEXDH_REPLY 31 -#define SSH2_MSG_USERAUTH_REQUEST 50 -#define SSH2_MSG_USERAUTH_FAILURE 51 -#define SSH2_MSG_USERAUTH_SUCCESS 52 -#define SSH2_MSG_USERAUTH_BANNER 53 -#define SSH2_MSG_USERAUTH_PK_OK 60 -#define SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ 60 -#define SSH2_MSG_GLOBAL_REQUEST 80 -#define SSH2_MSG_REQUEST_SUCCESS 81 -#define SSH2_MSG_REQUEST_FAILURE 82 -#define SSH2_MSG_CHANNEL_OPEN 90 -#define SSH2_MSG_CHANNEL_OPEN_CONFIRMATION 91 -#define SSH2_MSG_CHANNEL_OPEN_FAILURE 92 -#define SSH2_MSG_CHANNEL_WINDOW_ADJUST 93 -#define SSH2_MSG_CHANNEL_DATA 94 -#define SSH2_MSG_CHANNEL_EXTENDED_DATA 95 -#define SSH2_MSG_CHANNEL_EOF 96 -#define SSH2_MSG_CHANNEL_CLOSE 97 -#define SSH2_MSG_CHANNEL_REQUEST 98 -#define SSH2_MSG_CHANNEL_SUCCESS 99 -#define SSH2_MSG_CHANNEL_FAILURE 100 - -#define SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED 1 -#define SSH2_OPEN_CONNECT_FAILED 2 -#define SSH2_OPEN_UNKNOWN_CHANNEL_TYPE 3 -#define SSH2_OPEN_RESOURCE_SHORTAGE 4 -#define SSH2_EXTENDED_DATA_STDERR 1 +#define bombout(msg) ( ssh_state = SSH_STATE_CLOSED, closesocket(s), \ + s = INVALID_SOCKET, connection_fatal msg ) + +#define SSH1_MSG_DISCONNECT 1 /* 0x1 */ +#define SSH1_SMSG_PUBLIC_KEY 2 /* 0x2 */ +#define SSH1_CMSG_SESSION_KEY 3 /* 0x3 */ +#define SSH1_CMSG_USER 4 /* 0x4 */ +#define SSH1_CMSG_AUTH_RSA 6 /* 0x6 */ +#define SSH1_SMSG_AUTH_RSA_CHALLENGE 7 /* 0x7 */ +#define SSH1_CMSG_AUTH_RSA_RESPONSE 8 /* 0x8 */ +#define SSH1_CMSG_AUTH_PASSWORD 9 /* 0x9 */ +#define SSH1_CMSG_REQUEST_PTY 10 /* 0xa */ +#define SSH1_CMSG_WINDOW_SIZE 11 /* 0xb */ +#define SSH1_CMSG_EXEC_SHELL 12 /* 0xc */ +#define SSH1_CMSG_EXEC_CMD 13 /* 0xd */ +#define SSH1_SMSG_SUCCESS 14 /* 0xe */ +#define SSH1_SMSG_FAILURE 15 /* 0xf */ +#define SSH1_CMSG_STDIN_DATA 16 /* 0x10 */ +#define SSH1_SMSG_STDOUT_DATA 17 /* 0x11 */ +#define SSH1_SMSG_STDERR_DATA 18 /* 0x12 */ +#define SSH1_CMSG_EOF 19 /* 0x13 */ +#define SSH1_SMSG_EXIT_STATUS 20 /* 0x14 */ +#define SSH1_MSG_CHANNEL_OPEN_CONFIRMATION 21 /* 0x15 */ +#define SSH1_MSG_CHANNEL_OPEN_FAILURE 22 /* 0x16 */ +#define SSH1_MSG_CHANNEL_DATA 23 /* 0x17 */ +#define SSH1_MSG_CHANNEL_CLOSE 24 /* 0x18 */ +#define SSH1_MSG_CHANNEL_CLOSE_CONFIRMATION 25 /* 0x19 */ +#define SSH1_CMSG_AGENT_REQUEST_FORWARDING 30 /* 0x1e */ +#define SSH1_SMSG_AGENT_OPEN 31 /* 0x1f */ +#define SSH1_CMSG_EXIT_CONFIRMATION 33 /* 0x21 */ +#define SSH1_MSG_IGNORE 32 /* 0x20 */ +#define SSH1_MSG_DEBUG 36 /* 0x24 */ +#define SSH1_CMSG_AUTH_TIS 39 /* 0x27 */ +#define SSH1_SMSG_AUTH_TIS_CHALLENGE 40 /* 0x28 */ +#define SSH1_CMSG_AUTH_TIS_RESPONSE 41 /* 0x29 */ +#define SSH1_CMSG_AUTH_CCARD 70 /* 0x46 */ +#define SSH1_SMSG_AUTH_CCARD_CHALLENGE 71 /* 0x47 */ +#define SSH1_CMSG_AUTH_CCARD_RESPONSE 72 /* 0x48 */ + +#define SSH1_AUTH_TIS 5 /* 0x5 */ +#define SSH1_AUTH_CCARD 16 /* 0x10 */ + +#define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1 /* 0x1 */ +#define SSH_AGENT_RSA_IDENTITIES_ANSWER 2 /* 0x2 */ +#define SSH_AGENTC_RSA_CHALLENGE 3 /* 0x3 */ +#define SSH_AGENT_RSA_RESPONSE 4 /* 0x4 */ +#define SSH_AGENT_FAILURE 5 /* 0x5 */ +#define SSH_AGENT_SUCCESS 6 /* 0x6 */ +#define SSH_AGENTC_ADD_RSA_IDENTITY 7 /* 0x7 */ +#define SSH_AGENTC_REMOVE_RSA_IDENTITY 8 /* 0x8 */ + +#define SSH2_MSG_DISCONNECT 1 /* 0x1 */ +#define SSH2_MSG_IGNORE 2 /* 0x2 */ +#define SSH2_MSG_UNIMPLEMENTED 3 /* 0x3 */ +#define SSH2_MSG_DEBUG 4 /* 0x4 */ +#define SSH2_MSG_SERVICE_REQUEST 5 /* 0x5 */ +#define SSH2_MSG_SERVICE_ACCEPT 6 /* 0x6 */ +#define SSH2_MSG_KEXINIT 20 /* 0x14 */ +#define SSH2_MSG_NEWKEYS 21 /* 0x15 */ +#define SSH2_MSG_KEXDH_INIT 30 /* 0x1e */ +#define SSH2_MSG_KEXDH_REPLY 31 /* 0x1f */ +#define SSH2_MSG_USERAUTH_REQUEST 50 /* 0x32 */ +#define SSH2_MSG_USERAUTH_FAILURE 51 /* 0x33 */ +#define SSH2_MSG_USERAUTH_SUCCESS 52 /* 0x34 */ +#define SSH2_MSG_USERAUTH_BANNER 53 /* 0x35 */ +#define SSH2_MSG_USERAUTH_PK_OK 60 /* 0x3c */ +#define SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ 60 /* 0x3c */ +#define SSH2_MSG_GLOBAL_REQUEST 80 /* 0x50 */ +#define SSH2_MSG_REQUEST_SUCCESS 81 /* 0x51 */ +#define SSH2_MSG_REQUEST_FAILURE 82 /* 0x52 */ +#define SSH2_MSG_CHANNEL_OPEN 90 /* 0x5a */ +#define SSH2_MSG_CHANNEL_OPEN_CONFIRMATION 91 /* 0x5b */ +#define SSH2_MSG_CHANNEL_OPEN_FAILURE 92 /* 0x5c */ +#define SSH2_MSG_CHANNEL_WINDOW_ADJUST 93 /* 0x5d */ +#define SSH2_MSG_CHANNEL_DATA 94 /* 0x5e */ +#define SSH2_MSG_CHANNEL_EXTENDED_DATA 95 /* 0x5f */ +#define SSH2_MSG_CHANNEL_EOF 96 /* 0x60 */ +#define SSH2_MSG_CHANNEL_CLOSE 97 /* 0x61 */ +#define SSH2_MSG_CHANNEL_REQUEST 98 /* 0x62 */ +#define SSH2_MSG_CHANNEL_SUCCESS 99 /* 0x63 */ +#define SSH2_MSG_CHANNEL_FAILURE 100 /* 0x64 */ + +#define SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED 1 /* 0x1 */ +#define SSH2_OPEN_CONNECT_FAILED 2 /* 0x2 */ +#define SSH2_OPEN_UNKNOWN_CHANNEL_TYPE 3 /* 0x3 */ +#define SSH2_OPEN_RESOURCE_SHORTAGE 4 /* 0x4 */ + +#define SSH2_EXTENDED_DATA_STDERR 1 /* 0x1 */ #define GET_32BIT(cp) \ (((unsigned long)(unsigned char)(cp)[0] << 24) | \ @@ -121,54 +147,97 @@ enum { PKT_END, PKT_INT, PKT_CHAR, PKT_DATA, PKT_STR, PKT_BIGNUM }; #define crWaitUntil(c) do { crReturn(0); } while (!(c)) #define crWaitUntilV(c) do { crReturnV; } while (!(c)) -extern struct ssh_cipher ssh_3des; -extern struct ssh_cipher ssh_3des_ssh2; -extern struct ssh_cipher ssh_des; -extern struct ssh_cipher ssh_blowfish; +extern const struct ssh_cipher ssh_3des; +extern const struct ssh_cipher ssh_3des_ssh2; +extern const struct ssh_cipher ssh_des; +extern const struct ssh_cipher ssh_blowfish_ssh1; +extern const struct ssh_cipher ssh_blowfish_ssh2; -/* for ssh 2; we miss out single-DES because it isn't supported */ -struct ssh_cipher *ciphers[] = { &ssh_3des_ssh2, &ssh_blowfish }; - -extern struct ssh_kex ssh_diffiehellman; -struct ssh_kex *kex_algs[] = { &ssh_diffiehellman }; +/* + * Ciphers for SSH2. We miss out single-DES because it isn't + * supported; also 3DES and Blowfish are both done differently from + * SSH1. (3DES uses outer chaining; Blowfish has the opposite + * endianness and different-sized keys.) + */ +const static struct ssh_cipher *ciphers[] = { &ssh_blowfish_ssh2, &ssh_3des_ssh2 }; -extern struct ssh_hostkey ssh_dss; -struct ssh_hostkey *hostkey_algs[] = { &ssh_dss }; +extern const struct ssh_kex ssh_diffiehellman; +const static struct ssh_kex *kex_algs[] = { &ssh_diffiehellman }; -extern struct ssh_mac ssh_sha1; +extern const struct ssh_hostkey ssh_dss; +const static struct ssh_hostkey *hostkey_algs[] = { &ssh_dss }; -SHA_State exhash; +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) { } static int nullmac_verify(unsigned char *blk, int len, unsigned long seq) { return 1; } -struct ssh_mac ssh_mac_none = { +const static struct ssh_mac ssh_mac_none = { nullmac_key, nullmac_key, nullmac_generate, nullmac_verify, "none", 0 }; -struct ssh_mac *macs[] = { &ssh_sha1, &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 }; -struct ssh_compress ssh_comp_none = { +const static struct ssh_compress ssh_comp_none = { "none" }; -struct ssh_compress *compressions[] = { &ssh_comp_none }; +const static struct ssh_compress *compressions[] = { &ssh_comp_none }; + +/* + * 2-3-4 tree storing channels. + */ +struct ssh_channel { + unsigned remoteid, localid; + int type; + int closes; + union { + struct ssh_agent_channel { + unsigned char *message; + unsigned char msglen[4]; + int lensofar, totallen; + } a; + struct ssh2_data_channel { + unsigned char *outbuffer; + unsigned outbuflen, outbufsize; + unsigned remwindow, remmaxpkt; + } v2; + } u; +}; + +struct Packet { + long length; + int type; + unsigned char *data; + unsigned char *body; + long savedpos; + long maxlen; +}; + +static SHA_State exhash; static SOCKET s = INVALID_SOCKET; static unsigned char session_key[32]; -static struct ssh_cipher *cipher = NULL; -static struct ssh_cipher *cscipher = NULL; -static struct ssh_cipher *sccipher = NULL; -static struct ssh_mac *csmac = NULL; -static struct ssh_mac *scmac = NULL; -static struct ssh_compress *cscomp = NULL; -static struct ssh_compress *sccomp = NULL; -static struct ssh_kex *kex = NULL; -static struct ssh_hostkey *hostkey = NULL; +static const struct ssh_cipher *cipher = NULL; +static const struct ssh_cipher *cscipher = NULL; +static const struct ssh_cipher *sccipher = NULL; +static const struct ssh_mac *csmac = NULL; +static const struct ssh_mac *scmac = NULL; +static const struct ssh_compress *cscomp = NULL; +static const struct ssh_compress *sccomp = NULL; +static const struct ssh_kex *kex = NULL; +static const struct ssh_hostkey *hostkey = NULL; int (*ssh_get_password)(const char *prompt, char *str, int maxlen) = NULL; static char *savedhost; +static int savedport; static int ssh_send_ok; +static tree234 *ssh_channels; /* indexed by local id */ +static struct ssh_channel *mainchan; /* primary session channel */ + static enum { SSH_STATE_BEFORE_SIZE, SSH_STATE_INTERMED, @@ -178,12 +247,55 @@ static enum { static int size_needed = FALSE; +static struct Packet pktin = { 0, 0, NULL, NULL, 0 }; +static struct Packet pktout = { 0, 0, NULL, NULL, 0 }; + +static int ssh_version; +static void (*ssh_protocol)(unsigned char *in, int inlen, int ispkt); +static void ssh1_protocol(unsigned char *in, int inlen, int ispkt); +static void ssh2_protocol(unsigned char *in, int inlen, int ispkt); +static void ssh_size(void); + +static int (*s_rdpkt)(unsigned char **data, int *datalen); + +static struct rdpkt1_state_tag { + long len, pad, biglen, to_read; + unsigned long realcrc, gotcrc; + unsigned char *p; + int i; + int chunk; +} rdpkt1_state; + +static struct rdpkt2_state_tag { + long len, pad, payload, packetlen, maclen; + int i; + int cipherblk; + unsigned long incoming_sequence; +} rdpkt2_state; + +static int ssh_channelcmp(void *av, void *bv) { + struct ssh_channel *a = (struct ssh_channel *)av; + struct ssh_channel *b = (struct ssh_channel *)bv; + if (a->localid < b->localid) return -1; + if (a->localid > b->localid) return +1; + return 0; +} +static int ssh_channelfind(void *av, void *bv) { + unsigned *a = (unsigned *)av; + struct ssh_channel *b = (struct ssh_channel *)bv; + if (*a < b->localid) return -1; + if (*a > b->localid) return +1; + return 0; +} + static void s_write (char *buf, int len) { while (len > 0) { int i = send (s, buf, len, 0); noise_ultralight(i); - if (i <= 0) - fatalbox("Lost connection while sending"); + if (i <= 0) { + bombout(("Lost connection while sending")); + return; + } if (i > 0) len -= i, buf += i; } @@ -203,37 +315,16 @@ static int s_read (char *buf, int len) { } static void c_write (char *buf, int len) { - if (!(flags & FLAG_CONNECTION)) { + if ((flags & FLAG_STDERR)) { int i; for (i = 0; i < len; i++) if (buf[i] != '\r') fputc(buf[i], stderr); return; } - while (len--) - c_write1(*buf++); + from_backend(1, buf, len); } -struct Packet { - long length; - int type; - unsigned char *data; - unsigned char *body; - long savedpos; - long maxlen; -}; - -static struct Packet pktin = { 0, 0, NULL, NULL, 0 }; -static struct Packet pktout = { 0, 0, NULL, NULL, 0 }; - -static int ssh_version; -static void (*ssh_protocol)(unsigned char *in, int inlen, int ispkt); -static void ssh1_protocol(unsigned char *in, int inlen, int ispkt); -static void ssh2_protocol(unsigned char *in, int inlen, int ispkt); -static void ssh_size(void); - -static int (*s_rdpkt)(unsigned char **data, int *datalen); - /* * Collect incoming data in the incoming packet buffer. * Decipher and verify the packet when it is completely read. @@ -244,10 +335,7 @@ static int (*s_rdpkt)(unsigned char **data, int *datalen); */ static int ssh1_rdpkt(unsigned char **data, int *datalen) { - static long len, pad, biglen, to_read; - static unsigned long realcrc, gotcrc; - static unsigned char *p; - static int i; + struct rdpkt1_state_tag *st = &rdpkt1_state; crBegin; @@ -256,57 +344,63 @@ next_packet: pktin.type = 0; pktin.length = 0; - for (i = len = 0; i < 4; i++) { + for (st->i = st->len = 0; st->i < 4; st->i++) { while ((*datalen) == 0) - crReturn(4-i); - len = (len << 8) + **data; + crReturn(4-st->i); + st->len = (st->len << 8) + **data; (*data)++, (*datalen)--; } #ifdef FWHACK - if (len == 0x52656d6f) { /* "Remo"te server has closed ... */ - len = 0x300; /* big enough to carry to end */ + if (st->len == 0x52656d6f) { /* "Remo"te server has closed ... */ + st->len = 0x300; /* big enough to carry to end */ } #endif - pad = 8 - (len % 8); - biglen = len + pad; - pktin.length = len - 5; + st->pad = 8 - (st->len % 8); + st->biglen = st->len + st->pad; + pktin.length = st->len - 5; - if (pktin.maxlen < biglen) { - pktin.maxlen = biglen; - pktin.data = (pktin.data == NULL ? malloc(biglen+APIEXTRA) : - realloc(pktin.data, biglen+APIEXTRA)); + if (pktin.maxlen < st->biglen) { + pktin.maxlen = st->biglen; + pktin.data = (pktin.data == NULL ? malloc(st->biglen+APIEXTRA) : + realloc(pktin.data, st->biglen+APIEXTRA)); if (!pktin.data) fatalbox("Out of memory"); } - to_read = biglen; - p = pktin.data; - while (to_read > 0) { - static int chunk; - chunk = to_read; + st->to_read = st->biglen; + st->p = pktin.data; + while (st->to_read > 0) { + st->chunk = st->to_read; while ((*datalen) == 0) - crReturn(to_read); - if (chunk > (*datalen)) - chunk = (*datalen); - memcpy(p, *data, chunk); - *data += chunk; - *datalen -= chunk; - p += chunk; - to_read -= chunk; + crReturn(st->to_read); + if (st->chunk > (*datalen)) + st->chunk = (*datalen); + memcpy(st->p, *data, st->chunk); + *data += st->chunk; + *datalen -= st->chunk; + st->p += st->chunk; + st->to_read -= st->chunk; } if (cipher) - cipher->decrypt(pktin.data, biglen); + 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[pad]; - pktin.body = pktin.data + pad + 1; + pktin.type = pktin.data[st->pad]; + pktin.body = pktin.data + st->pad + 1; - realcrc = crc32(pktin.data, biglen-4); - gotcrc = GET_32BIT(pktin.data+biglen-4); - if (gotcrc != realcrc) { - fatalbox("Incorrect CRC received on packet"); + st->realcrc = crc32(pktin.data, st->biglen-4); + st->gotcrc = GET_32BIT(pktin.data+st->biglen-4); + if (st->gotcrc != st->realcrc) { + bombout(("Incorrect CRC received on packet")); + crReturn(0); } if (pktin.type == SSH1_SMSG_STDOUT_DATA || @@ -315,8 +409,10 @@ next_packet: pktin.type == SSH1_SMSG_AUTH_TIS_CHALLENGE || pktin.type == SSH1_SMSG_AUTH_CCARD_CHALLENGE) { long strlen = GET_32BIT(pktin.body); - if (strlen + 4 != pktin.length) - fatalbox("Received data packet with bogus string length"); + if (strlen + 4 != pktin.length) { + bombout(("Received data packet with bogus string length")); + crReturn(0); + } } if (pktin.type == SSH1_MSG_DEBUG) { @@ -339,29 +435,24 @@ next_packet: static int ssh2_rdpkt(unsigned char **data, int *datalen) { - static long len, pad, payload, packetlen, maclen; - static int i; - static int cipherblk; - static unsigned long incoming_sequence = 0; + struct rdpkt2_state_tag *st = &rdpkt2_state; crBegin; next_packet: - pktin.type = 0; pktin.length = 0; - - if (cipher) - cipherblk = cipher->blksize; + if (sccipher) + st->cipherblk = sccipher->blksize; else - cipherblk = 8; - if (cipherblk < 8) - cipherblk = 8; - - if (pktin.maxlen < cipherblk) { - pktin.maxlen = cipherblk; - pktin.data = (pktin.data == NULL ? malloc(cipherblk+APIEXTRA) : - realloc(pktin.data, cipherblk+APIEXTRA)); + st->cipherblk = 8; + if (st->cipherblk < 8) + st->cipherblk = 8; + + if (pktin.maxlen < st->cipherblk) { + pktin.maxlen = st->cipherblk; + pktin.data = (pktin.data == NULL ? malloc(st->cipherblk+APIEXTRA) : + realloc(pktin.data, st->cipherblk+APIEXTRA)); if (!pktin.data) fatalbox("Out of memory"); } @@ -370,10 +461,10 @@ next_packet: * Acquire and decrypt the first block of the packet. This will * contain the length and padding details. */ - for (i = len = 0; i < cipherblk; i++) { + for (st->i = st->len = 0; st->i < st->cipherblk; st->i++) { while ((*datalen) == 0) - crReturn(cipherblk-i); - pktin.data[i] = *(*data)++; + crReturn(st->cipherblk-st->i); + pktin.data[st->i] = *(*data)++; (*datalen)--; } #ifdef FWHACK @@ -382,34 +473,34 @@ next_packet: } #endif if (sccipher) - sccipher->decrypt(pktin.data, cipherblk); + sccipher->decrypt(pktin.data, st->cipherblk); /* * Now get the length and padding figures. */ - len = GET_32BIT(pktin.data); - pad = pktin.data[4]; + st->len = GET_32BIT(pktin.data); + st->pad = pktin.data[4]; /* * This enables us to deduce the payload length. */ - payload = len - pad - 1; + st->payload = st->len - st->pad - 1; - pktin.length = payload + 5; + pktin.length = st->payload + 5; /* * So now we can work out the total packet length. */ - packetlen = len + 4; - maclen = scmac ? scmac->len : 0; + st->packetlen = st->len + 4; + st->maclen = scmac ? scmac->len : 0; /* * Adjust memory allocation if packet is too big. */ - if (pktin.maxlen < packetlen) { - pktin.maxlen = packetlen; - pktin.data = (pktin.data == NULL ? malloc(packetlen+APIEXTRA) : - realloc(pktin.data, packetlen+APIEXTRA)); + if (pktin.maxlen < st->packetlen+st->maclen) { + pktin.maxlen = st->packetlen+st->maclen; + pktin.data = (pktin.data == NULL ? malloc(pktin.maxlen+APIEXTRA) : + realloc(pktin.data, pktin.maxlen+APIEXTRA)); if (!pktin.data) fatalbox("Out of memory"); } @@ -417,29 +508,32 @@ next_packet: /* * Read and decrypt the remainder of the packet. */ - for (i = cipherblk; i < packetlen + maclen; i++) { + for (st->i = st->cipherblk; st->i < st->packetlen + st->maclen; st->i++) { while ((*datalen) == 0) - crReturn(packetlen + maclen - i); - pktin.data[i] = *(*data)++; + crReturn(st->packetlen + st->maclen - st->i); + pktin.data[st->i] = *(*data)++; (*datalen)--; } /* Decrypt everything _except_ the MAC. */ if (sccipher) - sccipher->decrypt(pktin.data + cipherblk, packetlen - cipherblk); + sccipher->decrypt(pktin.data + st->cipherblk, + st->packetlen - st->cipherblk); #if 0 - debug(("Got packet len=%d pad=%d\r\n", len, pad)); - for (i = 0; i < packetlen; i++) - debug((" %02x", (unsigned char)pktin.data[i])); + debug(("Got packet len=%d pad=%d\r\n", st->len, st->pad)); + for (st->i = 0; st->i < st->packetlen; st->i++) + debug((" %02x", (unsigned char)pktin.data[st->i])); debug(("\r\n")); #endif /* * Check the MAC. */ - if (scmac && !scmac->verify(pktin.data, len+4, incoming_sequence)) - fatalbox("Incorrect MAC received on packet"); - incoming_sequence++; /* whether or not we MACed */ + if (scmac && !scmac->verify(pktin.data, st->len+4, st->incoming_sequence)) { + bombout(("Incorrect MAC received on packet")); + crReturn(0); + } + st->incoming_sequence++; /* whether or not we MACed */ pktin.savedpos = 6; pktin.type = pktin.data[5]; @@ -505,6 +599,12 @@ static void s_wrpkt(void) { 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); @@ -522,7 +622,6 @@ static void send_packet(int pkttype, ...) unsigned long argint; int pktlen, argtype, arglen; Bignum bn; - int i; pktlen = 0; va_start(args, pkttype); @@ -548,10 +647,7 @@ static void send_packet(int pkttype, ...) break; case PKT_BIGNUM: bn = va_arg(args, Bignum); - i = 16 * bn[0] - 1; - while ( i > 0 && (bn[i/16+1] >> (i%16)) == 0 ) - i--; - pktlen += 2 + (i+7)/8; + pktlen += ssh1_bignum_length(bn); break; default: assert(0); @@ -590,18 +686,7 @@ static void send_packet(int pkttype, ...) break; case PKT_BIGNUM: bn = va_arg(args, Bignum); - i = 16 * bn[0] - 1; - while ( i > 0 && (bn[i/16+1] >> (i%16)) == 0 ) - i--; - *p++ = (i >> 8) & 0xFF; - *p++ = i & 0xFF; - i = (i + 7) / 8; - while (i-- > 0) { - if (i % 2) - *p++ = bn[i/2+1] >> 8; - else - *p++ = bn[i/2+1] & 0xFF; - } + p += ssh1_write_bignum(p, bn); break; } } @@ -633,6 +718,7 @@ static char *connect_to_host(char *host, int port, char **realhost) if (port < 0) port = 22; /* default ssh port */ + savedport = port; #ifdef FWHACK FWhost = host; @@ -733,7 +819,7 @@ static int ssh_versioncmp(char *a, char *b) { * state. */ #include -void sha_string(SHA_State *s, void *str, int len) { +static void sha_string(SHA_State *s, void *str, int len) { unsigned char lenblk[4]; PUT_32BIT(lenblk, len); SHA_Bytes(s, lenblk, 4); @@ -743,7 +829,7 @@ void sha_string(SHA_State *s, void *str, int len) { /* * SSH2 packet construction functions. */ -void ssh2_pkt_adddata(void *data, int len) { +static void ssh2_pkt_adddata(void *data, int len) { pktout.length += len; if (pktout.maxlen < pktout.length) { pktout.maxlen = pktout.length + 256; @@ -754,40 +840,40 @@ void ssh2_pkt_adddata(void *data, int len) { } memcpy(pktout.data+pktout.length-len, data, len); } -void ssh2_pkt_addbyte(unsigned char byte) { +static void ssh2_pkt_addbyte(unsigned char byte) { ssh2_pkt_adddata(&byte, 1); } -void ssh2_pkt_init(int pkt_type) { +static void ssh2_pkt_init(int pkt_type) { pktout.length = 5; ssh2_pkt_addbyte((unsigned char)pkt_type); } -void ssh2_pkt_addbool(unsigned char value) { +static void ssh2_pkt_addbool(unsigned char value) { ssh2_pkt_adddata(&value, 1); } -void ssh2_pkt_adduint32(unsigned long value) { +static void ssh2_pkt_adduint32(unsigned long value) { unsigned char x[4]; PUT_32BIT(x, value); ssh2_pkt_adddata(x, 4); } -void ssh2_pkt_addstring_start(void) { +static void ssh2_pkt_addstring_start(void) { ssh2_pkt_adduint32(0); pktout.savedpos = pktout.length; } -void ssh2_pkt_addstring_str(char *data) { +static void ssh2_pkt_addstring_str(char *data) { ssh2_pkt_adddata(data, strlen(data)); PUT_32BIT(pktout.data + pktout.savedpos - 4, pktout.length - pktout.savedpos); } -void ssh2_pkt_addstring_data(char *data, int len) { +static void ssh2_pkt_addstring_data(char *data, int len) { ssh2_pkt_adddata(data, len); PUT_32BIT(pktout.data + pktout.savedpos - 4, pktout.length - pktout.savedpos); } -void ssh2_pkt_addstring(char *data) { +static void ssh2_pkt_addstring(char *data) { ssh2_pkt_addstring_start(); ssh2_pkt_addstring_str(data); } -char *ssh2_mpint_fmt(Bignum b, int *len) { +static char *ssh2_mpint_fmt(Bignum b, int *len) { unsigned char *p; int i, n = b[0]; p = malloc(n * 2 + 1); @@ -805,7 +891,7 @@ char *ssh2_mpint_fmt(Bignum b, int *len) { *len = n*2+1-i; return p; } -void ssh2_pkt_addmp(Bignum b) { +static void ssh2_pkt_addmp(Bignum b) { unsigned char *p; int len; p = ssh2_mpint_fmt(b, &len); @@ -813,7 +899,7 @@ void ssh2_pkt_addmp(Bignum b) { ssh2_pkt_addstring_data(p, len); free(p); } -void ssh2_pkt_send(void) { +static void ssh2_pkt_send(void) { int cipherblk, maclen, padding, i; static unsigned long outgoing_sequence = 0; @@ -861,7 +947,7 @@ void bndebug(char *string, Bignum b) { } #endif -void sha_mpint(SHA_State *s, Bignum b) { +static void sha_mpint(SHA_State *s, Bignum b) { unsigned char *p; int len; p = ssh2_mpint_fmt(b, &len); @@ -872,7 +958,7 @@ void sha_mpint(SHA_State *s, Bignum b) { /* * SSH2 packet decode functions. */ -unsigned long ssh2_pkt_getuint32(void) { +static unsigned long ssh2_pkt_getuint32(void) { unsigned long value; if (pktin.length - pktin.savedpos < 4) return 0; /* arrgh, no way to decline (FIXME?) */ @@ -880,7 +966,7 @@ unsigned long ssh2_pkt_getuint32(void) { pktin.savedpos += 4; return value; } -void ssh2_pkt_getstring(char **p, int *length) { +static void ssh2_pkt_getstring(char **p, int *length) { *p = NULL; if (pktin.length - pktin.savedpos < 4) return; @@ -891,7 +977,7 @@ void ssh2_pkt_getstring(char **p, int *length) { *p = pktin.data+pktin.savedpos; pktin.savedpos += *length; } -Bignum ssh2_pkt_getmp(void) { +static Bignum ssh2_pkt_getmp(void) { char *p; int i, j, length; Bignum b; @@ -899,8 +985,10 @@ Bignum ssh2_pkt_getmp(void) { ssh2_pkt_getstring(&p, &length); if (!p) return NULL; - if (p[0] & 0x80) - fatalbox("internal error: Can't handle negative mpints"); + if (p[0] & 0x80) { + bombout(("internal error: Can't handle negative mpints")); + return NULL; + } b = newbn((length+1)/2); for (i = 0; i < length; i++) { j = length - 1 - i; @@ -952,6 +1040,8 @@ static int do_ssh_init(void) { break; } + rdpkt2_state.incoming_sequence = 0; + *vsp = 0; sprintf(vlog, "Server version: %s", vstring); vlog[strcspn(vlog, "\r\n")] = '\0'; @@ -1013,13 +1103,16 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) static int tried_publickey; static unsigned char session_id[16]; int cipher_type; + static char username[100]; crBegin; if (!ispkt) crWaitUntil(ispkt); - if (pktin.type != SSH1_SMSG_PUBLIC_KEY) - fatalbox("Public key packet not received"); + if (pktin.type != SSH1_SMSG_PUBLIC_KEY) { + bombout(("Public key packet not received")); + crReturn(0); + } logevent("Received public keys"); @@ -1029,21 +1122,15 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) j = makekey(pktin.body+8+i, &hostkey, &keystr2, 0); /* - * Hash the host key and print the hash in the log box. Just as - * a last resort in case the registry's host key checking is - * compromised, we'll allow the user some ability to verify - * host keys by eye. + * Log the host key fingerprint. */ - MD5Init(&md5c); - MD5Update(&md5c, keystr2, hostkey.bytes); - MD5Final(session_id, &md5c); { char logmsg[80]; - int i; - logevent("Host key MD5 is:"); + logevent("Host key fingerprint is:"); strcpy(logmsg, " "); - for (i = 0; i < 16; i++) - sprintf(logmsg+strlen(logmsg), "%02x", session_id[i]); + hostkey.comment = NULL; + rsa_fingerprint(logmsg+strlen(logmsg), sizeof(logmsg)-strlen(logmsg), + &hostkey); logevent(logmsg); } @@ -1073,11 +1160,13 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) * First format the key into a string. */ int len = rsastr_len(&hostkey); + char fingerprint[100]; char *keystr = malloc(len); if (!keystr) fatalbox("Out of memory"); rsastr_fmt(keystr, &hostkey); - verify_ssh_host_key(savedhost, keystr); + rsa_fingerprint(fingerprint, sizeof(fingerprint), &hostkey); + verify_ssh_host_key(savedhost, savedport, "rsa", keystr, fingerprint); free(keystr); } @@ -1122,25 +1211,27 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) free(rsabuf); - cipher = cipher_type == SSH_CIPHER_BLOWFISH ? &ssh_blowfish : + cipher = cipher_type == SSH_CIPHER_BLOWFISH ? &ssh_blowfish_ssh1 : cipher_type == SSH_CIPHER_DES ? &ssh_des : &ssh_3des; cipher->sesskey(session_key); crWaitUntil(ispkt); - if (pktin.type != SSH1_SMSG_SUCCESS) - fatalbox("Encryption not successfully enabled"); + if (pktin.type != SSH1_SMSG_SUCCESS) { + bombout(("Encryption not successfully enabled")); + crReturn(0); + } logevent("Successfully started encryption"); fflush(stdout); { - static char username[100]; static int pos = 0; static char c; - if (!(flags & FLAG_CONNECTION) && !*cfg.username) { + if ((flags & FLAG_INTERACTIVE) && !*cfg.username) { c_write("login as: ", 10); + ssh_send_ok = 1; while (pos >= 0) { crWaitUntil(!ispkt); while (inlen--) switch (c = *in++) { @@ -1179,7 +1270,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) char stuff[200]; strncpy(username, cfg.username, 99); username[99] = '\0'; - if (flags & FLAG_VERBOSE) { + if ((flags & FLAG_VERBOSE) || (flags & FLAG_INTERACTIVE)) { sprintf(stuff, "Sent username \"%s\".\r\n", username); c_write(stuff, strlen(stuff)); } @@ -1199,6 +1290,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) while (pktin.type == SSH1_SMSG_FAILURE) { static char password[100]; + static char prompt[200]; static int pos; static char c; static int pwpkt_type; @@ -1208,12 +1300,176 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) * authentication. */ pwpkt_type = SSH1_CMSG_AUTH_PASSWORD; + if (agent_exists()) { + /* + * Attempt RSA authentication using Pageant. + */ + static unsigned char request[5], *response, *p; + static int responselen; + static int i, nkeys; + static int authed = FALSE; + void *r; + + logevent("Pageant is running. Requesting keys."); + + /* Request the keys held by the agent. */ + PUT_32BIT(request, 1); + request[4] = SSH_AGENTC_REQUEST_RSA_IDENTITIES; + agent_query(request, 5, &r, &responselen); + response = (unsigned char *)r; + if (response) { + p = response + 5; + nkeys = GET_32BIT(p); p += 4; + { char buf[64]; sprintf(buf, "Pageant has %d keys", nkeys); + logevent(buf); } + for (i = 0; i < nkeys; i++) { + static struct RSAKey key; + static Bignum challenge; + static char *commentp; + static int commentlen; + + { char buf[64]; sprintf(buf, "Trying Pageant key #%d", i); + logevent(buf); } + p += 4; + p += ssh1_read_bignum(p, &key.exponent); + p += ssh1_read_bignum(p, &key.modulus); + commentlen = GET_32BIT(p); p += 4; + commentp = p; p += commentlen; + send_packet(SSH1_CMSG_AUTH_RSA, + PKT_BIGNUM, key.modulus, PKT_END); + crWaitUntil(ispkt); + if (pktin.type != SSH1_SMSG_AUTH_RSA_CHALLENGE) { + logevent("Key refused"); + continue; + } + logevent("Received RSA challenge"); + ssh1_read_bignum(pktin.body, &challenge); + { + char *agentreq, *q, *ret; + int len, retlen; + len = 1 + 4; /* message type, bit count */ + len += ssh1_bignum_length(key.exponent); + len += ssh1_bignum_length(key.modulus); + len += ssh1_bignum_length(challenge); + len += 16; /* session id */ + len += 4; /* response format */ + agentreq = malloc(4 + len); + PUT_32BIT(agentreq, len); + q = agentreq + 4; + *q++ = SSH_AGENTC_RSA_CHALLENGE; + PUT_32BIT(q, ssh1_bignum_bitcount(key.modulus)); + q += 4; + q += ssh1_write_bignum(q, key.exponent); + q += ssh1_write_bignum(q, key.modulus); + q += ssh1_write_bignum(q, challenge); + memcpy(q, session_id, 16); q += 16; + PUT_32BIT(q, 1); /* response format */ + agent_query(agentreq, len+4, &ret, &retlen); + free(agentreq); + if (ret) { + if (ret[4] == SSH_AGENT_RSA_RESPONSE) { + logevent("Sending Pageant's response"); + send_packet(SSH1_CMSG_AUTH_RSA_RESPONSE, + PKT_DATA, ret+5, 16, PKT_END); + free(ret); + crWaitUntil(ispkt); + if (pktin.type == SSH1_SMSG_SUCCESS) { + logevent("Pageant's response accepted"); + if (flags & FLAG_VERBOSE) { + c_write("Authenticated using RSA key \"", + 29); + c_write(commentp, commentlen); + c_write("\" from agent\r\n", 14); + } + authed = TRUE; + } else + logevent("Pageant's response not accepted"); + } else { + logevent("Pageant failed to answer challenge"); + free(ret); + } + } else { + logevent("No reply received from Pageant"); + } + } + freebn(key.exponent); + freebn(key.modulus); + freebn(challenge); + if (authed) + break; + } + } + if (authed) + break; + } if (*cfg.keyfile && !tried_publickey) pwpkt_type = SSH1_CMSG_AUTH_RSA; - if (pwpkt_type == SSH1_CMSG_AUTH_PASSWORD && !FLAG_WINDOWED) { - char prompt[200]; - sprintf(prompt, "%s@%s's password: ", cfg.username, savedhost); + if (pktin.type == SSH1_SMSG_FAILURE && + cfg.try_tis_auth && + (supported_auths_mask & (1< sizeof(prompt)-1) + challengelen = sizeof(prompt)-1; /* prevent overrun */ + memcpy(prompt, pktin.body+4, challengelen); + prompt[challengelen] = '\0'; + } + } + if (pktin.type == SSH1_SMSG_FAILURE && + cfg.try_tis_auth && + (supported_auths_mask & (1< sizeof(prompt)-1) + challengelen = sizeof(prompt)-1; /* prevent overrun */ + memcpy(prompt, pktin.body+4, challengelen); + strncpy(prompt + challengelen, "\r\nResponse : ", + sizeof(prompt)-challengelen); + prompt[sizeof(prompt)-1] = '\0'; + } + } + if (pwpkt_type == SSH1_CMSG_AUTH_PASSWORD) { + sprintf(prompt, "%.90s@%.90s's password: ", + username, savedhost); + } + if (pwpkt_type == SSH1_CMSG_AUTH_RSA) { + char *comment = NULL; + if (flags & FLAG_VERBOSE) + c_write("Trying public key authentication.\r\n", 35); + if (!rsakey_encrypted(cfg.keyfile, &comment)) { + if (flags & FLAG_VERBOSE) + c_write("No passphrase required.\r\n", 25); + goto tryauth; + } + sprintf(prompt, "Passphrase for key \"%.100s\": ", comment); + free(comment); + } + + if (ssh_get_password) { if (!ssh_get_password(prompt, password, sizeof(password))) { /* * get_password failed to get a password (for @@ -1226,60 +1482,9 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) crReturn(1); } } else { - - if (pktin.type == SSH1_SMSG_FAILURE && - cfg.try_tis_auth && - (supported_auths_mask & (1<= 0) { crWaitUntil(!ispkt); while (inlen--) switch (c = *in++) { @@ -1306,8 +1511,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) } } c_write("\r\n", 2); - - } + } tryauth: if (pwpkt_type == SSH1_CMSG_AUTH_RSA) { @@ -1321,7 +1525,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) 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)); @@ -1342,12 +1546,13 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) crWaitUntil(ispkt); if (pktin.type == SSH1_SMSG_FAILURE) { - if (flags & FLAG_VERBOSE) - c_write("Server refused our public key.\r\n", 32); + c_write("Server refused our public key.\r\n", 32); continue; /* go and try password */ } - if (pktin.type != SSH1_SMSG_AUTH_RSA_CHALLENGE) - fatalbox("Bizarre response to offer of public key"); + if (pktin.type != SSH1_SMSG_AUTH_RSA_CHALLENGE) { + bombout(("Bizarre response to offer of public key")); + crReturn(0); + } ssh1_read_bignum(pktin.body, &challenge); response = rsadecrypt(challenge, &pubkey); freebn(pubkey.private_exponent); /* burn the evidence */ @@ -1372,7 +1577,8 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) 45); continue; /* go and try password */ } else if (pktin.type != SSH1_SMSG_SUCCESS) { - fatalbox("Bizarre response to RSA authentication response"); + bombout(("Bizarre response to RSA authentication response")); + crReturn(0); } break; /* we're through! */ @@ -1391,7 +1597,8 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) ssh_state = SSH_STATE_CLOSED; crReturn(1); } else if (pktin.type != SSH1_SMSG_SUCCESS) { - fatalbox("Strange packet received, type %d", pktin.type); + bombout(("Strange packet received, type %d", pktin.type)); + crReturn(0); } } @@ -1411,6 +1618,19 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { if (ssh_state == SSH_STATE_CLOSED) crReturnV; + if (cfg.agentfwd && agent_exists()) { + logevent("Requesting agent forwarding"); + send_packet(SSH1_CMSG_AGENT_REQUEST_FORWARDING, PKT_END); + do { crReturnV; } while (!ispkt); + if (pktin.type != SSH1_SMSG_SUCCESS && pktin.type != SSH1_SMSG_FAILURE) { + bombout(("Protocol confusion")); + crReturnV; + } else if (pktin.type == SSH1_SMSG_FAILURE) { + logevent("Agent forwarding refused"); + } else + logevent("Agent forwarding enabled"); + } + if (!cfg.nopty) { send_packet(SSH1_CMSG_REQUEST_PTY, PKT_STR, cfg.termtype, @@ -1421,7 +1641,8 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { ssh_state = SSH_STATE_INTERMED; do { crReturnV; } while (!ispkt); if (pktin.type != SSH1_SMSG_SUCCESS && pktin.type != SSH1_SMSG_FAILURE) { - fatalbox("Protocol confusion"); + bombout(("Protocol confusion")); + crReturnV; } else if (pktin.type == SSH1_SMSG_FAILURE) { c_write("Server refused to allocate pty\r\n", 32); } @@ -1439,16 +1660,109 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { ssh_size(); ssh_send_ok = 1; + ssh_channels = newtree234(ssh_channelcmp); + begin_session(); while (1) { crReturnV; if (ispkt) { if (pktin.type == SSH1_SMSG_STDOUT_DATA || pktin.type == SSH1_SMSG_STDERR_DATA) { long len = GET_32BIT(pktin.body); - c_write(pktin.body+4, len); + from_backend(pktin.type == SSH1_SMSG_STDERR_DATA, + pktin.body+4, len); } else if (pktin.type == SSH1_MSG_DISCONNECT) { ssh_state = SSH_STATE_CLOSED; logevent("Received disconnect request"); + } else if (pktin.type == SSH1_SMSG_AGENT_OPEN) { + /* Remote side is trying to open a channel to talk to our + * agent. Give them back a local channel number. */ + unsigned i = 1; + struct ssh_channel *c; + enum234 e; + for (c = first234(ssh_channels, &e); c; c = next234(&e)) { + if (c->localid > i) + break; /* found a free number */ + i = c->localid + 1; + } + c = malloc(sizeof(struct ssh_channel)); + c->remoteid = GET_32BIT(pktin.body); + c->localid = i; + c->closes = 0; + c->type = SSH1_SMSG_AGENT_OPEN; /* identify channel type */ + c->u.a.lensofar = 0; + add234(ssh_channels, c); + send_packet(SSH1_MSG_CHANNEL_OPEN_CONFIRMATION, + PKT_INT, c->remoteid, PKT_INT, c->localid, + PKT_END); + } else if (pktin.type == SSH1_MSG_CHANNEL_CLOSE || + pktin.type == SSH1_MSG_CHANNEL_CLOSE_CONFIRMATION) { + /* Remote side closes a channel. */ + unsigned i = GET_32BIT(pktin.body); + struct ssh_channel *c; + c = find234(ssh_channels, &i, ssh_channelfind); + if (c) { + int closetype; + closetype = (pktin.type == SSH1_MSG_CHANNEL_CLOSE ? 1 : 2); + send_packet(pktin.type, PKT_INT, c->remoteid, PKT_END); + c->closes |= closetype; + if (c->closes == 3) { + del234(ssh_channels, c); + free(c); + } + } + } else if (pktin.type == SSH1_MSG_CHANNEL_DATA) { + /* Data sent down one of our channels. */ + int i = GET_32BIT(pktin.body); + int len = GET_32BIT(pktin.body+4); + unsigned char *p = pktin.body+8; + struct ssh_channel *c; + c = find234(ssh_channels, &i, ssh_channelfind); + if (c) { + switch(c->type) { + case SSH1_SMSG_AGENT_OPEN: + /* Data for an agent message. Buffer it. */ + while (len > 0) { + if (c->u.a.lensofar < 4) { + int l = min(4 - c->u.a.lensofar, len); + memcpy(c->u.a.msglen + c->u.a.lensofar, p, l); + p += l; len -= l; c->u.a.lensofar += l; + } + if (c->u.a.lensofar == 4) { + c->u.a.totallen = 4 + GET_32BIT(c->u.a.msglen); + c->u.a.message = malloc(c->u.a.totallen); + memcpy(c->u.a.message, c->u.a.msglen, 4); + } + if (c->u.a.lensofar >= 4 && len > 0) { + int l = min(c->u.a.totallen - c->u.a.lensofar, len); + memcpy(c->u.a.message + c->u.a.lensofar, p, l); + p += l; len -= l; c->u.a.lensofar += l; + } + if (c->u.a.lensofar == c->u.a.totallen) { + void *reply, *sentreply; + int replylen; + agent_query(c->u.a.message, c->u.a.totallen, + &reply, &replylen); + if (reply) + sentreply = reply; + else { + /* Fake SSH_AGENT_FAILURE. */ + sentreply = "\0\0\0\1\5"; + replylen = 5; + } + send_packet(SSH1_MSG_CHANNEL_DATA, + PKT_INT, c->remoteid, + PKT_INT, replylen, + PKT_DATA, sentreply, replylen, + PKT_END); + if (reply) + free(reply); + free(c->u.a.message); + c->u.a.lensofar = 0; + } + } + break; + } + } } else if (pktin.type == SSH1_SMSG_SUCCESS) { /* may be from EXEC_SHELL on some servers */ } else if (pktin.type == SSH1_SMSG_FAILURE) { @@ -1457,7 +1771,8 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { } else if (pktin.type == SSH1_SMSG_EXIT_STATUS) { send_packet(SSH1_CMSG_EXIT_CONFIRMATION, PKT_END); } else { - fatalbox("Strange packet received: type %d", pktin.type); + bombout(("Strange packet received: type %d", pktin.type)); + crReturnV; } } else { send_packet(SSH1_CMSG_STDIN_DATA, @@ -1471,7 +1786,7 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { /* * Utility routine for decoding comma-separated strings in KEXINIT. */ -int in_commasep_string(char *needle, char *haystack, int haylen) { +static int in_commasep_string(char *needle, char *haystack, int haylen) { int needlen = strlen(needle); while (1) { /* @@ -1498,7 +1813,7 @@ int in_commasep_string(char *needle, char *haystack, int haylen) { /* * SSH2 key creation method. */ -void ssh2_mkkey(Bignum K, char *H, char chr, char *keyspace) { +static void ssh2_mkkey(Bignum K, char *H, char chr, char *keyspace) { SHA_State s; /* First 20 bytes. */ SHA_Init(&s); @@ -1523,20 +1838,46 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) static int i, len; static char *str; static Bignum e, f, K; - static struct ssh_cipher *cscipher_tobe = NULL; - static struct ssh_cipher *sccipher_tobe = NULL; - static struct ssh_mac *csmac_tobe = NULL; - static struct ssh_mac *scmac_tobe = NULL; - static struct ssh_compress *cscomp_tobe = NULL; - static struct ssh_compress *sccomp_tobe = NULL; - static char *hostkeydata, *sigdata, *keystr; + 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; + static const struct ssh_mac *scmac_tobe = NULL; + static const struct ssh_compress *cscomp_tobe = NULL; + static const struct ssh_compress *sccomp_tobe = NULL; + static char *hostkeydata, *sigdata, *keystr, *fingerprint; static int hostkeylen, siglen; static unsigned char exchange_hash[20]; static unsigned char keyspace[40]; + static const struct ssh_cipher *preferred_cipher; crBegin; random_init(); + /* + * Set up the preferred cipher. + */ + if (cfg.cipher == CIPHER_BLOWFISH) { + preferred_cipher = &ssh_blowfish_ssh2; + } else if (cfg.cipher == CIPHER_DES) { + logevent("Single DES not supported in SSH2; using 3DES"); + preferred_cipher = &ssh_3des_ssh2; + } else if (cfg.cipher == CIPHER_3DES) { + preferred_cipher = &ssh_3des_ssh2; + } else { + /* Shouldn't happen, but we do want to initialise to _something_. */ + preferred_cipher = &ssh_3des_ssh2; + } + + /* + * Be prepared to work around the buggy MAC problem. + */ + if (cfg.buggymac) + maclist = buggymacs, nmacs = lenof(buggymacs); + else + maclist = macs, nmacs = lenof(macs); + begin_key_exchange: /* * Construct and send our key exchange packet. @@ -1560,30 +1901,32 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) } /* List client->server encryption algorithms. */ ssh2_pkt_addstring_start(); - for (i = 0; i < lenof(ciphers); i++) { - ssh2_pkt_addstring_str(ciphers[i]->name); - if (i < lenof(ciphers)-1) + for (i = 0; i < lenof(ciphers)+1; i++) { + const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1]; + ssh2_pkt_addstring_str(c->name); + if (i < lenof(ciphers)) ssh2_pkt_addstring_str(","); } /* List server->client encryption algorithms. */ ssh2_pkt_addstring_start(); - for (i = 0; i < lenof(ciphers); i++) { - ssh2_pkt_addstring_str(ciphers[i]->name); - if (i < lenof(ciphers)-1) + for (i = 0; i < lenof(ciphers)+1; i++) { + const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1]; + ssh2_pkt_addstring_str(c->name); + if (i < lenof(ciphers)) ssh2_pkt_addstring_str(","); } /* List client->server MAC algorithms. */ ssh2_pkt_addstring_start(); - for (i = 0; i < lenof(macs); i++) { - ssh2_pkt_addstring_str(macs[i]->name); - if (i < lenof(macs)-1) + for (i = 0; i < nmacs; i++) { + ssh2_pkt_addstring_str(maclist[i]->name); + if (i < nmacs-1) ssh2_pkt_addstring_str(","); } /* List server->client MAC algorithms. */ ssh2_pkt_addstring_start(); - for (i = 0; i < lenof(macs); i++) { - ssh2_pkt_addstring_str(macs[i]->name); - if (i < lenof(macs)-1) + for (i = 0; i < nmacs; i++) { + ssh2_pkt_addstring_str(maclist[i]->name); + if (i < nmacs-1) ssh2_pkt_addstring_str(","); } /* List client->server compression algorithms. */ @@ -1619,7 +1962,8 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) * to. */ if (pktin.type != SSH2_MSG_KEXINIT) { - fatalbox("expected key exchange packet from server"); + bombout(("expected key exchange packet from server")); + crReturn(0); } kex = NULL; hostkey = NULL; cscipher_tobe = NULL; sccipher_tobe = NULL; csmac_tobe = NULL; scmac_tobe = NULL; cscomp_tobe = NULL; sccomp_tobe = NULL; @@ -1639,30 +1983,32 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) } } ssh2_pkt_getstring(&str, &len); /* client->server cipher */ - for (i = 0; i < lenof(ciphers); i++) { - if (in_commasep_string(ciphers[i]->name, str, len)) { - cscipher_tobe = ciphers[i]; + for (i = 0; i < lenof(ciphers)+1; i++) { + const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1]; + if (in_commasep_string(c->name, str, len)) { + cscipher_tobe = c; break; } } ssh2_pkt_getstring(&str, &len); /* server->client cipher */ - for (i = 0; i < lenof(ciphers); i++) { - if (in_commasep_string(ciphers[i]->name, str, len)) { - sccipher_tobe = ciphers[i]; + for (i = 0; i < lenof(ciphers)+1; i++) { + const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1]; + if (in_commasep_string(c->name, str, len)) { + sccipher_tobe = c; break; } } ssh2_pkt_getstring(&str, &len); /* client->server mac */ - for (i = 0; i < lenof(macs); i++) { - if (in_commasep_string(macs[i]->name, str, len)) { - csmac_tobe = macs[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(macs); i++) { - if (in_commasep_string(macs[i]->name, str, len)) { - scmac_tobe = macs[i]; + for (i = 0; i < nmacs; i++) { + if (in_commasep_string(maclist[i]->name, str, len)) { + scmac_tobe = maclist[i]; break; } } @@ -1685,8 +2031,10 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) * Currently we only support Diffie-Hellman and DSS, so let's * bomb out if those aren't selected. */ - if (kex != &ssh_diffiehellman || hostkey != &ssh_dss) - fatalbox("internal fault: chaos in SSH 2 transport layer"); + if (kex != &ssh_diffiehellman || hostkey != &ssh_dss) { + bombout(("internal fault: chaos in SSH 2 transport layer")); + crReturn(0); + } /* * Now we begin the fun. Generate and send e for Diffie-Hellman. @@ -1698,7 +2046,8 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) crWaitUntil(ispkt); if (pktin.type != SSH2_MSG_KEXDH_REPLY) { - fatalbox("expected key exchange packet from server"); + bombout(("expected key exchange packet from server")); + crReturn(0); } ssh2_pkt_getstring(&hostkeydata, &hostkeylen); f = ssh2_pkt_getmp(); @@ -1720,22 +2069,31 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) #endif hostkey->setkey(hostkeydata, hostkeylen); - if (!hostkey->verifysig(sigdata, siglen, exchange_hash, 20)) - fatalbox("Server failed host key check"); + if (!hostkey->verifysig(sigdata, siglen, exchange_hash, 20)) { + bombout(("Server failed host key check")); + crReturn(0); + } /* * Expect SSH2_MSG_NEWKEYS from server. */ crWaitUntil(ispkt); - if (pktin.type != SSH2_MSG_NEWKEYS) - fatalbox("expected new-keys packet from server"); + if (pktin.type != SSH2_MSG_NEWKEYS) { + bombout(("expected new-keys packet from server")); + crReturn(0); + } /* * Authenticate remote host: verify host key. (We've already * checked the signature of the exchange hash.) */ keystr = hostkey->fmtkey(); - verify_ssh_host_key(savedhost, keystr); + fingerprint = hostkey->fingerprint(); + verify_ssh_host_key(savedhost, savedport, hostkey->keytype, + keystr, fingerprint); + logevent("Host key fingerprint is:"); + logevent(fingerprint); + free(fingerprint); free(keystr); /* @@ -1778,11 +2136,6 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) } /* - * SSH2: remote identifier for the main session channel. - */ -static unsigned long ssh_remote_channel; - -/* * Handle the SSH2 userauth and connection layers. */ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) @@ -1799,8 +2152,10 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) ssh2_pkt_addstring("ssh-userauth"); ssh2_pkt_send(); crWaitUntilV(ispkt); - if (pktin.type != SSH2_MSG_SERVICE_ACCEPT) - fatalbox("Server refused user authentication protocol"); + if (pktin.type != SSH2_MSG_SERVICE_ACCEPT) { + bombout(("Server refused user authentication protocol")); + crReturnV; + } /* * FIXME: currently we support only password authentication. @@ -1816,8 +2171,9 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) static int pos = 0; static char c; - if ((flags & FLAG_CONNECTION) && !*cfg.username) { + if ((flags & FLAG_INTERACTIVE) && !*cfg.username) { c_write("login as: ", 10); + ssh_send_ok = 1; while (pos >= 0) { crWaitUntilV(!ispkt); while (inlen--) switch (c = *in++) { @@ -1856,15 +2212,15 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) char stuff[200]; strncpy(username, cfg.username, 99); username[99] = '\0'; - if (flags & FLAG_VERBOSE) { + if ((flags & FLAG_VERBOSE) || (flags & FLAG_INTERACTIVE)) { sprintf(stuff, "Using username \"%s\".\r\n", username); c_write(stuff, strlen(stuff)); } } - if (!(flags & FLAG_WINDOWED)) { + if (ssh_get_password) { char prompt[200]; - sprintf(prompt, "%s@%s's password: ", cfg.username, savedhost); + sprintf(prompt, "%.90s@%.90s's password: ", username, savedhost); if (!ssh_get_password(prompt, password, sizeof(password))) { /* * get_password failed to get a password (for @@ -1878,6 +2234,7 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) } } else { c_write("password: ", 10); + ssh_send_ok = 1; pos = 0; while (pos >= 0) { @@ -1933,111 +2290,210 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) /* * So now create a channel with a session in it. */ + mainchan = malloc(sizeof(struct ssh_channel)); + mainchan->localid = 100; /* as good as any */ ssh2_pkt_init(SSH2_MSG_CHANNEL_OPEN); ssh2_pkt_addstring("session"); - ssh2_pkt_adduint32(100); /* as good as any */ - ssh2_pkt_adduint32(0xFFFFFFFFUL); /* very big window which we ignore */ - ssh2_pkt_adduint32(0xFFFFFFFFUL); /* very big max pkt size */ + ssh2_pkt_adduint32(mainchan->localid); + ssh2_pkt_adduint32(0x8000UL); /* our window size */ + ssh2_pkt_adduint32(0x4000UL); /* our max pkt size */ ssh2_pkt_send(); crWaitUntilV(ispkt); if (pktin.type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION) { - fatalbox("Server refused to open a session"); + bombout(("Server refused to open a session")); + crReturnV; /* FIXME: error data comes back in FAILURE packet */ } - if (ssh2_pkt_getuint32() != 100) { - fatalbox("Server's channel confirmation cited wrong channel"); + if (ssh2_pkt_getuint32() != mainchan->localid) { + bombout(("Server's channel confirmation cited wrong channel")); + crReturnV; } - ssh_remote_channel = ssh2_pkt_getuint32(); - remote_winsize = ssh2_pkt_getuint32(); - remote_maxpkt = ssh2_pkt_getuint32(); + mainchan->remoteid = ssh2_pkt_getuint32(); + mainchan->u.v2.remwindow = ssh2_pkt_getuint32(); + mainchan->u.v2.remmaxpkt = ssh2_pkt_getuint32(); + mainchan->u.v2.outbuffer = NULL; + mainchan->u.v2.outbuflen = mainchan->u.v2.outbufsize = 0; logevent("Opened channel for session"); /* * Now allocate a pty for the session. */ - ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST); - ssh2_pkt_adduint32(ssh_remote_channel); /* recipient channel */ - ssh2_pkt_addstring("pty-req"); - ssh2_pkt_addbool(1); /* want reply */ - ssh2_pkt_addstring(cfg.termtype); - ssh2_pkt_adduint32(cols); - ssh2_pkt_adduint32(rows); - ssh2_pkt_adduint32(0); /* pixel width */ - ssh2_pkt_adduint32(0); /* pixel height */ - ssh2_pkt_addstring_start(); - ssh2_pkt_addstring_data("\0", 1); /* TTY_OP_END, no special options */ - ssh2_pkt_send(); + if (!cfg.nopty) { + ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST); + ssh2_pkt_adduint32(mainchan->remoteid); /* recipient channel */ + ssh2_pkt_addstring("pty-req"); + ssh2_pkt_addbool(1); /* want reply */ + ssh2_pkt_addstring(cfg.termtype); + ssh2_pkt_adduint32(cols); + ssh2_pkt_adduint32(rows); + ssh2_pkt_adduint32(0); /* pixel width */ + ssh2_pkt_adduint32(0); /* pixel height */ + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data("\0", 1);/* TTY_OP_END, no special options */ + ssh2_pkt_send(); - do { /* FIXME: pay attention to these */ - crWaitUntilV(ispkt); - } while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST); + do { + crWaitUntilV(ispkt); + if (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST) { + /* FIXME: be able to handle other channels here */ + if (ssh2_pkt_getuint32() != mainchan->localid) + continue; /* wrong channel */ + mainchan->u.v2.remwindow += ssh2_pkt_getuint32(); + } + } while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST); - if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) { - if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) { - fatalbox("Server got confused by pty request"); + if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) { + if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) { + bombout(("Server got confused by pty request")); + crReturnV; + } + c_write("Server refused to allocate pty\r\n", 32); + } else { + logevent("Allocated pty"); } - c_write("Server refused to allocate pty\r\n", 32); - } else { - logevent("Allocated pty"); } /* - * Start a shell. + * Start a shell or a remote command. */ ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST); - ssh2_pkt_adduint32(ssh_remote_channel); /* recipient channel */ - ssh2_pkt_addstring("shell"); - ssh2_pkt_addbool(1); /* want reply */ + ssh2_pkt_adduint32(mainchan->remoteid); /* recipient channel */ + if (*cfg.remote_cmd) { + ssh2_pkt_addstring("exec"); + ssh2_pkt_addbool(1); /* want reply */ + ssh2_pkt_addstring(cfg.remote_cmd); + } else { + ssh2_pkt_addstring("shell"); + ssh2_pkt_addbool(1); /* want reply */ + } ssh2_pkt_send(); - do { /* FIXME: pay attention to these */ + do { crWaitUntilV(ispkt); + if (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST) { + /* FIXME: be able to handle other channels here */ + if (ssh2_pkt_getuint32() != mainchan->localid) + continue; /* wrong channel */ + mainchan->u.v2.remwindow += ssh2_pkt_getuint32(); + } } while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST); if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) { if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) { - fatalbox("Server got confused by shell request"); + bombout(("Server got confused by shell/command request")); + crReturnV; } - fatalbox("Server refused to start a shell"); + bombout(("Server refused to start a shell/command")); + crReturnV; } else { - logevent("Started a shell"); + logevent("Started a shell/command"); } /* * Transfer data! */ ssh_send_ok = 1; + begin_session(); while (1) { + static int try_send; crReturnV; + try_send = FALSE; if (ispkt) { if (pktin.type == SSH2_MSG_CHANNEL_DATA || pktin.type == SSH2_MSG_CHANNEL_EXTENDED_DATA) { char *data; int length; - if (ssh2_pkt_getuint32() != 100) + /* FIXME: be able to handle other channels here */ + if (ssh2_pkt_getuint32() != mainchan->localid) continue; /* wrong channel */ if (pktin.type == SSH2_MSG_CHANNEL_EXTENDED_DATA && ssh2_pkt_getuint32() != SSH2_EXTENDED_DATA_STDERR) continue; /* extended but not stderr */ ssh2_pkt_getstring(&data, &length); - if (data) - c_write(data, length); + if (data) { + from_backend(pktin.type == SSH2_MSG_CHANNEL_EXTENDED_DATA, + data, length); + /* + * Enlarge the window again at the remote side, + * just in case it ever runs down and they fail + * to send us any more data. + */ + ssh2_pkt_init(SSH2_MSG_CHANNEL_WINDOW_ADJUST); + ssh2_pkt_adduint32(mainchan->remoteid); + ssh2_pkt_adduint32(length); + ssh2_pkt_send(); + } } else if (pktin.type == SSH2_MSG_DISCONNECT) { ssh_state = SSH_STATE_CLOSED; - logevent("Received disconnect request"); + logevent("Received disconnect message"); } else if (pktin.type == SSH2_MSG_CHANNEL_REQUEST) { continue; /* exit status et al; ignore (FIXME?) */ + } else if (pktin.type == SSH2_MSG_CHANNEL_EOF) { + continue; /* remote sends EOF; ignore */ + } else if (pktin.type == SSH2_MSG_CHANNEL_CLOSE) { + /* FIXME: be able to handle other channels here */ + if (ssh2_pkt_getuint32() != mainchan->localid) + continue; /* wrong channel */ + ssh2_pkt_init(SSH2_MSG_CHANNEL_CLOSE); + ssh2_pkt_adduint32(mainchan->remoteid); + ssh2_pkt_send(); + /* FIXME: mark the channel as closed */ + if (1 /* FIXME: "all channels are closed" */) { + 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) { - continue; /* ignore for now (FIXME!) */ + /* FIXME: be able to handle other channels here */ + if (ssh2_pkt_getuint32() != mainchan->localid) + continue; /* wrong channel */ + mainchan->u.v2.remwindow += ssh2_pkt_getuint32(); + try_send = TRUE; } else { - fatalbox("Strange packet received: type %d", pktin.type); + bombout(("Strange packet received: type %d", pktin.type)); + crReturnV; } } else { - /* FIXME: for now, ignore window size */ - ssh2_pkt_init(SSH2_MSG_CHANNEL_DATA); - ssh2_pkt_adduint32(ssh_remote_channel); - ssh2_pkt_addstring_start(); - ssh2_pkt_addstring_data(in, inlen); - ssh2_pkt_send(); + /* + * We have spare data. Add it to the channel buffer. + */ + if (mainchan->u.v2.outbufsize < + mainchan->u.v2.outbuflen + inlen) { + mainchan->u.v2.outbufsize = + mainchan->u.v2.outbuflen + inlen + 1024; + mainchan->u.v2.outbuffer = srealloc(mainchan->u.v2.outbuffer, + mainchan->u.v2.outbufsize); + } + memcpy(mainchan->u.v2.outbuffer + mainchan->u.v2.outbuflen, + in, inlen); + mainchan->u.v2.outbuflen += inlen; + try_send = TRUE; } + if (try_send) { + /* + * Try to send data on the channel if we can. (FIXME: + * on _all_ channels.) + */ + while (mainchan->u.v2.remwindow > 0 && + mainchan->u.v2.outbuflen > 0) { + unsigned len = mainchan->u.v2.remwindow; + if (len > mainchan->u.v2.outbuflen) + len = mainchan->u.v2.outbuflen; + if (len > mainchan->u.v2.remmaxpkt) + len = mainchan->u.v2.remmaxpkt; + ssh2_pkt_init(SSH2_MSG_CHANNEL_DATA); + ssh2_pkt_adduint32(mainchan->remoteid); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(mainchan->u.v2.outbuffer, len); + ssh2_pkt_send(); + mainchan->u.v2.outbuflen -= len; + memmove(mainchan->u.v2.outbuffer, mainchan->u.v2.outbuffer+len, + mainchan->u.v2.outbuflen); + mainchan->u.v2.remwindow -= len; + } + } } crFinishV; @@ -2102,8 +2558,11 @@ static int ssh_msg (WPARAM wParam, LPARAM lParam) { if (s == INVALID_SOCKET) return 1; - if (WSAGETSELECTERROR(lParam) != 0) + if (WSAGETSELECTERROR(lParam) != 0) { + closesocket(s); + s = INVALID_SOCKET; return -WSAGETSELECTERROR(lParam); + } switch (WSAGETSELECTEVENT(lParam)) { case FD_READ: @@ -2111,8 +2570,11 @@ static int ssh_msg (WPARAM wParam, LPARAM lParam) { ret = recv(s, buf, sizeof(buf), 0); if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK) return 1; - if (ret < 0) /* any _other_ error */ + if (ret < 0) { /* any _other_ error */ + closesocket(s); + s = INVALID_SOCKET; return -10000-WSAGetLastError(); + } if (ret == 0) { s = INVALID_SOCKET; return 0; @@ -2165,11 +2627,20 @@ static void ssh_size(void) { */ static void ssh_special (Telnet_Special code) { if (code == TS_EOF) { - if (ssh_version = 1) { + if (ssh_version == 1) { send_packet(SSH1_CMSG_EOF, PKT_END); } else { ssh2_pkt_init(SSH2_MSG_CHANNEL_EOF); - ssh2_pkt_adduint32(ssh_remote_channel); + ssh2_pkt_adduint32(mainchan->remoteid); + ssh2_pkt_send(); + } + logevent("Sent EOF message"); + } else if (code == TS_PING) { + if (ssh_version == 1) { + send_packet(SSH1_MSG_IGNORE, PKT_STR, "", PKT_END); + } else { + ssh2_pkt_init(SSH2_MSG_IGNORE); + ssh2_pkt_addstring_start(); ssh2_pkt_send(); } } else { @@ -2177,170 +2648,6 @@ static void ssh_special (Telnet_Special code) { } } - -/* - * Read and decrypt one incoming SSH packet. - * (only used by pSCP) - */ -static void get_packet(void) -{ - unsigned char buf[4096], *p; - long to_read; - int len; - - p = NULL; - len = 0; - - while ((to_read = s_rdpkt(&p, &len)) > 0) { - if (to_read > sizeof(buf)) to_read = sizeof(buf); - len = s_read(buf, to_read); - if (len != to_read) { - closesocket(s); - s = INVALID_SOCKET; - return; - } - p = buf; - } - - assert(len == 0); -} - -/* - * Receive a block of data over the SSH link. Block until - * all data is available. Return nr of bytes read (0 if lost connection). - * (only used by pSCP) - */ -int ssh_scp_recv(unsigned char *buf, int len) -{ - static int pending_input_len = 0; - static unsigned char *pending_input_ptr; - int to_read = len; - - if (pending_input_len >= to_read) { - memcpy(buf, pending_input_ptr, to_read); - pending_input_ptr += to_read; - pending_input_len -= to_read; - return len; - } - - if (pending_input_len > 0) { - memcpy(buf, pending_input_ptr, pending_input_len); - buf += pending_input_len; - to_read -= pending_input_len; - pending_input_len = 0; - } - - if (s == INVALID_SOCKET) - return 0; - while (to_read > 0) { - get_packet(); - if (s == INVALID_SOCKET) - return 0; - if (pktin.type == SSH1_SMSG_STDOUT_DATA) { - int plen = GET_32BIT(pktin.body); - if (plen <= to_read) { - memcpy(buf, pktin.body + 4, plen); - buf += plen; - to_read -= plen; - } else { - memcpy(buf, pktin.body + 4, to_read); - pending_input_len = plen - to_read; - pending_input_ptr = pktin.body + 4 + to_read; - to_read = 0; - } - } else if (pktin.type == SSH1_SMSG_STDERR_DATA) { - int plen = GET_32BIT(pktin.body); - fwrite(pktin.body + 4, plen, 1, stderr); - } else if (pktin.type == SSH1_MSG_DISCONNECT) { - logevent("Received disconnect request"); - } else if (pktin.type == SSH1_SMSG_SUCCESS || - pktin.type == SSH1_SMSG_FAILURE) { - /* ignore */ - } else if (pktin.type == SSH1_SMSG_EXIT_STATUS) { - char logbuf[100]; - sprintf(logbuf, "Remote exit status: %d", GET_32BIT(pktin.body)); - logevent(logbuf); - send_packet(SSH1_CMSG_EXIT_CONFIRMATION, PKT_END); - logevent("Closing connection"); - closesocket(s); - s = INVALID_SOCKET; - } else { - fatalbox("Strange packet received: type %d", pktin.type); - } - } - - return len; -} - -/* - * Send a block of data over the SSH link. - * Block until all data is sent. - * (only used by pSCP) - */ -void ssh_scp_send(unsigned char *buf, int len) -{ - if (s == INVALID_SOCKET) - return; - send_packet(SSH1_CMSG_STDIN_DATA, - PKT_INT, len, PKT_DATA, buf, len, PKT_END); -} - -/* - * Send an EOF notification to the server. - * (only used by pSCP) - */ -void ssh_scp_send_eof(void) -{ - if (s == INVALID_SOCKET) - return; - send_packet(SSH1_CMSG_EOF, PKT_END); -} - -/* - * Set up the connection, login on the remote host and - * start execution of a command. - * Returns an error message, or NULL on success. - * (only used by pSCP) - */ -char *ssh_scp_init(char *host, int port, char *cmd, char **realhost) -{ - char buf[160], *p; - -#ifdef MSCRYPTOAPI - if (crypto_startup() == 0) - return "Microsoft high encryption pack not installed!"; -#endif - - p = connect_to_host(host, port, realhost); - if (p != NULL) - return p; - - random_init(); - - if (!do_ssh_init()) - return "Protocol initialisation error"; - - /* Exchange keys and login */ - do { - get_packet(); - if (s == INVALID_SOCKET) - return "Connection closed by remote host"; - } while (!do_ssh1_login(NULL, 0, 1)); - - if (ssh_state == SSH_STATE_CLOSED) { - closesocket(s); - s = INVALID_SOCKET; - return "Session initialisation error"; - } - - /* Execute command */ - sprintf(buf, "Sending command: %.100s", cmd); - logevent(buf); - send_packet(SSH1_CMSG_EXEC_CMD, PKT_STR, cmd, PKT_END); - - return NULL; -} - static SOCKET ssh_socket(void) { return s; } static int ssh_sendok(void) { return ssh_send_ok; } @@ -2352,5 +2659,6 @@ Backend ssh_backend = { ssh_size, ssh_special, ssh_socket, - ssh_sendok + ssh_sendok, + 22 };