X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/729e54b41014557a58caa06e25a51150c78b11d3..1983e559d79a20dc24eefd04d081e6f33625f286:/ssh.c diff --git a/ssh.c b/ssh.c index 15fd3c41..f087bd91 100644 --- a/ssh.c +++ b/ssh.c @@ -1,14 +1,8 @@ +#include #include #include #include #include -#ifndef AUTO_WINSOCK -#ifdef WINSOCK_TWO -#include -#else -#include -#endif -#endif #include "putty.h" #include "tree234.h" @@ -25,8 +19,9 @@ if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) \ fprintf(stderr, "%s\n", s); } -#define bombout(msg) ( ssh_state == SSH_STATE_CLOSED, closesocket(s), \ - s = INVALID_SOCKET, connection_fatal msg ) +#define bombout(msg) ( ssh_state = SSH_STATE_CLOSED, \ + (s ? sk_close(s), s = NULL : 0), \ + connection_fatal msg ) #define SSH1_MSG_DISCONNECT 1 /* 0x1 */ #define SSH1_SMSG_PUBLIC_KEY 2 /* 0x2 */ @@ -52,11 +47,17 @@ #define SSH1_MSG_CHANNEL_DATA 23 /* 0x17 */ #define SSH1_MSG_CHANNEL_CLOSE 24 /* 0x18 */ #define SSH1_MSG_CHANNEL_CLOSE_CONFIRMATION 25 /* 0x19 */ +#define SSH1_SMSG_X11_OPEN 27 /* 0x1b */ +#define SSH1_CMSG_PORT_FORWARD_REQUEST 28 /* 0x1c */ +#define SSH1_MSG_PORT_OPEN 29 /* 0x1d */ #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_CMSG_EXIT_CONFIRMATION 33 /* 0x21 */ +#define SSH1_CMSG_X11_REQUEST_FORWARDING 34 /* 0x22 */ +#define SSH1_CMSG_AUTH_RHOSTS_RSA 35 /* 0x23 */ #define SSH1_MSG_DEBUG 36 /* 0x24 */ +#define SSH1_CMSG_REQUEST_COMPRESSION 37 /* 0x25 */ #define SSH1_CMSG_AUTH_TIS 39 /* 0x27 */ #define SSH1_SMSG_AUTH_TIS_CHALLENGE 40 /* 0x28 */ #define SSH1_CMSG_AUTH_TIS_RESPONSE 41 /* 0x29 */ @@ -67,15 +68,6 @@ #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 */ @@ -86,6 +78,10 @@ #define SSH2_MSG_NEWKEYS 21 /* 0x15 */ #define SSH2_MSG_KEXDH_INIT 30 /* 0x1e */ #define SSH2_MSG_KEXDH_REPLY 31 /* 0x1f */ +#define SSH2_MSG_KEX_DH_GEX_REQUEST 30 /* 0x1e */ +#define SSH2_MSG_KEX_DH_GEX_GROUP 31 /* 0x1f */ +#define SSH2_MSG_KEX_DH_GEX_INIT 32 /* 0x20 */ +#define SSH2_MSG_KEX_DH_GEX_REPLY 33 /* 0x21 */ #define SSH2_MSG_USERAUTH_REQUEST 50 /* 0x32 */ #define SSH2_MSG_USERAUTH_FAILURE 51 /* 0x33 */ #define SSH2_MSG_USERAUTH_SUCCESS 52 /* 0x34 */ @@ -107,6 +103,18 @@ #define SSH2_MSG_CHANNEL_SUCCESS 99 /* 0x63 */ #define SSH2_MSG_CHANNEL_FAILURE 100 /* 0x64 */ +#define SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT 1 /* 0x1 */ +#define SSH2_DISCONNECT_PROTOCOL_ERROR 2 /* 0x2 */ +#define SSH2_DISCONNECT_KEY_EXCHANGE_FAILED 3 /* 0x3 */ +#define SSH2_DISCONNECT_HOST_AUTHENTICATION_FAILED 4 /* 0x4 */ +#define SSH2_DISCONNECT_MAC_ERROR 5 /* 0x5 */ +#define SSH2_DISCONNECT_COMPRESSION_ERROR 6 /* 0x6 */ +#define SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE 7 /* 0x7 */ +#define SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED 8 /* 0x8 */ +#define SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE 9 /* 0x9 */ +#define SSH2_DISCONNECT_CONNECTION_LOST 10 /* 0xa */ +#define SSH2_DISCONNECT_BY_APPLICATION 11 /* 0xb */ + #define SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED 1 /* 0x1 */ #define SSH2_OPEN_CONNECT_FAILED 2 /* 0x2 */ #define SSH2_OPEN_UNKNOWN_CHANNEL_TYPE 3 /* 0x3 */ @@ -147,11 +155,10 @@ 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 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; +extern char *x11_init (Socket *, char *, void *); +extern void x11_close (Socket); +extern void x11_send (Socket , char *, int); +extern void x11_invent_auth(char *, int, char *, int); /* * Ciphers for SSH2. We miss out single-DES because it isn't @@ -159,15 +166,19 @@ extern const struct ssh_cipher ssh_blowfish_ssh2; * 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 const struct ssh_kex ssh_diffiehellman; -const static struct ssh_kex *kex_algs[] = { &ssh_diffiehellman }; +const static struct ssh2_ciphers *ciphers[] = { + &ssh2_aes, + &ssh2_blowfish, + &ssh2_3des, +}; -extern const struct ssh_hostkey ssh_dss; -const static struct ssh_hostkey *hostkey_algs[] = { &ssh_dss }; +const static struct ssh_kex *kex_algs[] = { +#ifdef DO_DIFFIE_HELLMAN_GEX + &ssh_diffiehellman_gex, +#endif + &ssh_diffiehellman }; -extern const struct ssh_mac ssh_sha1; +const static struct ssh_signkey *hostkey_algs[] = { &ssh_rsa, &ssh_dss }; static void nullmac_key(unsigned char *key) { } static void nullmac_generate(unsigned char *blk, int len, unsigned long seq) { } @@ -175,12 +186,30 @@ static int nullmac_verify(unsigned char *blk, int len, unsigned long seq) { retu 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 *macs[] = { + &ssh_sha1, &ssh_md5, &ssh_mac_none }; +const static struct ssh_mac *buggymacs[] = { + &ssh_sha1_buggy, &ssh_md5, &ssh_mac_none }; + +static void ssh_comp_none_init(void) { } +static int ssh_comp_none_block(unsigned char *block, int len, + unsigned char **outblock, int *outlen) { + return 0; +} const static struct ssh_compress ssh_comp_none = { - "none" + "none", + ssh_comp_none_init, ssh_comp_none_block, + ssh_comp_none_init, ssh_comp_none_block +}; +extern const struct ssh_compress ssh_zlib; +const static struct ssh_compress *compressions[] = { + &ssh_zlib, &ssh_comp_none }; + +enum { /* channel types */ + CHAN_MAINSESSION, + CHAN_X11, + CHAN_AGENT, }; -const static struct ssh_compress *compressions[] = { &ssh_comp_none }; /* * 2-3-4 tree storing channels. @@ -189,17 +218,20 @@ struct ssh_channel { unsigned remoteid, localid; int type; int closes; + struct ssh2_data_channel { + unsigned char *outbuffer; + unsigned outbuflen, outbufsize; + unsigned remwindow, remmaxpkt; + } v2; 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; + struct ssh_x11_channel { + Socket s; + } x11; } u; }; @@ -212,46 +244,57 @@ struct Packet { long maxlen; }; -static SHA_State exhash; +static SHA_State exhash, exhashbase; -static SOCKET s = INVALID_SOCKET; +static Socket s = NULL; static unsigned char session_key[32]; +static int ssh1_compressing; +static int ssh_agentfwd_enabled; +static int ssh_X11_fwd_enabled; static const struct ssh_cipher *cipher = NULL; -static const struct ssh_cipher *cscipher = NULL; -static const struct ssh_cipher *sccipher = NULL; +static const struct ssh2_cipher *cscipher = NULL; +static const struct ssh2_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; +static const struct ssh_signkey *hostkey = NULL; +static unsigned char ssh2_session_id[20]; int (*ssh_get_password)(const char *prompt, char *str, int maxlen) = NULL; static char *savedhost; static int savedport; static int ssh_send_ok; +static int ssh_echoing, ssh_editing; static tree234 *ssh_channels; /* indexed by local id */ static struct ssh_channel *mainchan; /* primary session channel */ static enum { + SSH_STATE_PREPACKET, SSH_STATE_BEFORE_SIZE, SSH_STATE_INTERMED, SSH_STATE_SESSION, SSH_STATE_CLOSED -} ssh_state = SSH_STATE_BEFORE_SIZE; +} ssh_state = SSH_STATE_PREPACKET; -static int size_needed = FALSE; +static int size_needed = FALSE, eof_needed = FALSE; static struct Packet pktin = { 0, 0, NULL, NULL, 0 }; static struct Packet pktout = { 0, 0, NULL, NULL, 0 }; +static unsigned char *deferred_send_data = NULL; +static int deferred_len = 0, deferred_size = 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 void ssh_special (Telnet_Special); +static void ssh2_try_send(struct ssh_channel *c); +static void ssh2_add_channel_data(struct ssh_channel *c, char *buf, int len); static int (*s_rdpkt)(unsigned char **data, int *datalen); @@ -263,6 +306,13 @@ static struct rdpkt1_state_tag { 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; @@ -278,32 +328,6 @@ static int ssh_channelfind(void *av, void *bv) { 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) { - bombout(("Lost connection while sending")); - return; - } - if (i > 0) - len -= i, buf += i; - } -} - -static int s_read (char *buf, int len) { - int ret = 0; - while (len > 0) { - int i = recv (s, buf, len, 0); - noise_ultralight(i); - if (i > 0) - len -= i, buf += i, ret += i; - else - return i; - } - return ret; -} - static void c_write (char *buf, int len) { if ((flags & FLAG_STDERR)) { int i; @@ -312,13 +336,11 @@ static void c_write (char *buf, int len) { fputc(buf[i], stderr); return; } - while (len--) - c_write1(*buf++); + from_backend(1, buf, len); } -static void c_writedata (char *buf, int len) { - while (len--) - c_write1(*buf++); +static void c_write_str (char *buf) { + c_write(buf, strlen(buf)); } /* @@ -359,8 +381,8 @@ next_packet: if (pktin.maxlen < st->biglen) { pktin.maxlen = st->biglen; - pktin.data = (pktin.data == NULL ? malloc(st->biglen+APIEXTRA) : - realloc(pktin.data, st->biglen+APIEXTRA)); + pktin.data = (pktin.data == NULL ? smalloc(st->biglen+APIEXTRA) : + srealloc(pktin.data, st->biglen+APIEXTRA)); if (!pktin.data) fatalbox("Out of memory"); } @@ -382,9 +404,12 @@ next_packet: if (cipher) cipher->decrypt(pktin.data, st->biglen); - - pktin.type = pktin.data[st->pad]; - pktin.body = pktin.data + st->pad + 1; +#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 st->realcrc = crc32(pktin.data, st->biglen-4); st->gotcrc = GET_32BIT(pktin.data+st->biglen-4); @@ -393,6 +418,40 @@ next_packet: crReturn(0); } + pktin.body = pktin.data + st->pad + 1; + + if (ssh1_compressing) { + unsigned char *decompblk; + int decomplen; +#if 0 + int i; + debug(("Packet payload pre-decompression:\n")); + for (i = -1; i < pktin.length; i++) + debug((" %02x", (unsigned char)pktin.body[i])); + debug(("\r\n")); +#endif + zlib_decompress_block(pktin.body-1, pktin.length+1, + &decompblk, &decomplen); + + if (pktin.maxlen < st->pad + decomplen) { + pktin.maxlen = st->pad + decomplen; + pktin.data = srealloc(pktin.data, pktin.maxlen+APIEXTRA); + pktin.body = pktin.data + st->pad + 1; + if (!pktin.data) + fatalbox("Out of memory"); + } + + memcpy(pktin.body-1, decompblk, decomplen); + sfree(decompblk); + pktin.length = decomplen-1; +#if 0 + debug(("Packet payload post-decompression:\n")); + for (i = -1; i < pktin.length; i++) + debug((" %02x", (unsigned char)pktin.body[i])); + debug(("\r\n")); +#endif + } + if (pktin.type == SSH1_SMSG_STDOUT_DATA || pktin.type == SSH1_SMSG_STDERR_DATA || pktin.type == SSH1_MSG_DEBUG || @@ -405,6 +464,8 @@ next_packet: } } + pktin.type = pktin.body[-1]; + if (pktin.type == SSH1_MSG_DEBUG) { /* log debug message */ char buf[80]; @@ -425,29 +486,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 ? smalloc(st->cipherblk+APIEXTRA) : + srealloc(pktin.data, st->cipherblk+APIEXTRA)); if (!pktin.data) fatalbox("Out of memory"); } @@ -456,10 +512,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 @@ -468,34 +524,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+maclen) { - pktin.maxlen = packetlen+maclen; - pktin.data = (pktin.data == NULL ? malloc(pktin.maxlen+APIEXTRA) : - realloc(pktin.data, pktin.maxlen+APIEXTRA)); + if (pktin.maxlen < st->packetlen+st->maclen) { + pktin.maxlen = st->packetlen+st->maclen; + pktin.data = (pktin.data == NULL ? smalloc(pktin.maxlen+APIEXTRA) : + srealloc(pktin.data, pktin.maxlen+APIEXTRA)); if (!pktin.data) fatalbox("Out of memory"); } @@ -503,31 +559,60 @@ 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)) { + if (scmac && !scmac->verify(pktin.data, st->len+4, st->incoming_sequence)) { bombout(("Incorrect MAC received on packet")); crReturn(0); } - incoming_sequence++; /* whether or not we MACed */ + st->incoming_sequence++; /* whether or not we MACed */ + + /* + * Decompress packet payload. + */ + { + unsigned char *newpayload; + int newlen; + if (sccomp && sccomp->decompress(pktin.data+5, pktin.length-5, + &newpayload, &newlen)) { + if (pktin.maxlen < newlen+5) { + pktin.maxlen = newlen+5; + pktin.data = (pktin.data == NULL ? smalloc(pktin.maxlen+APIEXTRA) : + srealloc(pktin.data, pktin.maxlen+APIEXTRA)); + if (!pktin.data) + fatalbox("Out of memory"); + } + pktin.length = 5 + newlen; + memcpy(pktin.data+5, newpayload, newlen); +#if 0 + debug(("Post-decompression payload:\r\n")); + for (st->i = 0; st->i < newlen; st->i++) + debug((" %02x", (unsigned char)pktin.data[5+st->i])); + debug(("\r\n")); +#endif + + sfree(newpayload); + } + } pktin.savedpos = 6; pktin.type = pktin.data[5]; @@ -538,20 +623,7 @@ next_packet: crFinish(0); } -static void ssh_gotdata(unsigned char *data, int datalen) -{ - while (datalen > 0) { - if ( s_rdpkt(&data, &datalen) == 0 ) { - ssh_protocol(NULL, 0, 1); - if (ssh_state == SSH_STATE_CLOSED) { - return; - } - } - } -} - - -static void s_wrpkt_start(int type, int len) { +static void ssh1_pktout_size(int len) { int pad, biglen; len += 5; /* type and CRC */ @@ -564,39 +636,71 @@ static void s_wrpkt_start(int type, int len) { #ifdef MSCRYPTOAPI /* Allocate enough buffer space for extra block * for MS CryptEncrypt() */ - pktout.data = (pktout.data == NULL ? malloc(biglen+12) : - realloc(pktout.data, biglen+12)); + pktout.data = (pktout.data == NULL ? smalloc(biglen+12) : + srealloc(pktout.data, biglen+12)); #else - pktout.data = (pktout.data == NULL ? malloc(biglen+4) : - realloc(pktout.data, biglen+4)); + pktout.data = (pktout.data == NULL ? smalloc(biglen+4) : + srealloc(pktout.data, biglen+4)); #endif if (!pktout.data) fatalbox("Out of memory"); } + pktout.body = pktout.data+4+pad+1; +} +static void s_wrpkt_start(int type, int len) { + ssh1_pktout_size(len); pktout.type = type; - pktout.body = pktout.data+4+pad+1; } static void s_wrpkt(void) { int pad, len, biglen, i; unsigned long crc; + pktout.body[-1] = pktout.type; + + if (ssh1_compressing) { + unsigned char *compblk; + int complen; +#if 0 + debug(("Packet payload pre-compression:\n")); + for (i = -1; i < pktout.length; i++) + debug((" %02x", (unsigned char)pktout.body[i])); + debug(("\r\n")); +#endif + zlib_compress_block(pktout.body-1, pktout.length+1, + &compblk, &complen); + ssh1_pktout_size(complen-1); + memcpy(pktout.body-1, compblk, complen); + sfree(compblk); +#if 0 + debug(("Packet payload post-compression:\n")); + for (i = -1; i < pktout.length; i++) + debug((" %02x", (unsigned char)pktout.body[i])); + debug(("\r\n")); +#endif + } + len = pktout.length + 5; /* type and CRC */ pad = 8 - (len%8); biglen = len + pad; - pktout.body[-1] = pktout.type; for (i=0; iencrypt(pktout.data+4, biglen); - s_write(pktout.data, biglen+4); + sk_write(s, pktout.data, biglen+4); } /* @@ -683,109 +787,6 @@ static void send_packet(int pkttype, ...) s_wrpkt(); } - -/* - * Connect to specified host and port. - * Returns an error message, or NULL on success. - * Also places the canonical host name into `realhost'. - */ -static char *connect_to_host(char *host, int port, char **realhost) -{ - SOCKADDR_IN addr; - struct hostent *h; - unsigned long a; -#ifdef FWHACK - char *FWhost; - int FWport; -#endif - - savedhost = malloc(1+strlen(host)); - if (!savedhost) - fatalbox("Out of memory"); - strcpy(savedhost, host); - - if (port < 0) - port = 22; /* default ssh port */ - savedport = port; - -#ifdef FWHACK - FWhost = host; - FWport = port; - host = FWSTR; - port = 23; -#endif - - /* - * Try to find host. - */ - if ( (a = inet_addr(host)) == (unsigned long) INADDR_NONE) { - if ( (h = gethostbyname(host)) == NULL) - switch (WSAGetLastError()) { - case WSAENETDOWN: return "Network is down"; - case WSAHOST_NOT_FOUND: case WSANO_DATA: - return "Host does not exist"; - case WSATRY_AGAIN: return "Host not found"; - default: return "gethostbyname: unknown error"; - } - memcpy (&a, h->h_addr, sizeof(a)); - *realhost = h->h_name; - } else - *realhost = host; -#ifdef FWHACK - *realhost = FWhost; -#endif - a = ntohl(a); - - /* - * Open socket. - */ - s = socket(AF_INET, SOCK_STREAM, 0); - if (s == INVALID_SOCKET) - switch (WSAGetLastError()) { - case WSAENETDOWN: return "Network is down"; - case WSAEAFNOSUPPORT: return "TCP/IP support not present"; - default: return "socket(): unknown error"; - } - - /* - * Bind to local address. - */ - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_ANY); - addr.sin_port = htons(0); - if (bind (s, (struct sockaddr *)&addr, sizeof(addr)) == SOCKET_ERROR) - switch (WSAGetLastError()) { - case WSAENETDOWN: return "Network is down"; - default: return "bind(): unknown error"; - } - - /* - * Connect to remote address. - */ - addr.sin_addr.s_addr = htonl(a); - addr.sin_port = htons((short)port); - if (connect (s, (struct sockaddr *)&addr, sizeof(addr)) == SOCKET_ERROR) - switch (WSAGetLastError()) { - case WSAENETDOWN: return "Network is down"; - case WSAECONNREFUSED: return "Connection refused"; - case WSAENETUNREACH: return "Network is unreachable"; - case WSAEHOSTUNREACH: return "No route to host"; - default: return "connect(): unknown error"; - } - -#ifdef FWHACK - send(s, "connect ", 8, 0); - send(s, FWhost, strlen(FWhost), 0); - { - char buf[20]; - sprintf(buf, " %d\n", FWport); - send (s, buf, strlen(buf), 0); - } -#endif - - return NULL; -} - static int ssh_versioncmp(char *a, char *b) { char *ae, *be; unsigned long av, bv; @@ -803,102 +804,137 @@ static int ssh_versioncmp(char *a, char *b) { /* - * Utility routine for putting an SSH-protocol `string' into a SHA - * state. + * Utility routines for putting an SSH-protocol `string' and + * `uint32' into a SHA 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); SHA_Bytes(s, str, len); } +static void sha_uint32(SHA_State *s, unsigned i) { + unsigned char intblk[4]; + PUT_32BIT(intblk, i); + SHA_Bytes(s, intblk, 4); +} + /* * SSH2 packet construction functions. */ -void ssh2_pkt_adddata(void *data, int len) { - pktout.length += len; - if (pktout.maxlen < pktout.length) { - pktout.maxlen = pktout.length + 256; - pktout.data = (pktout.data == NULL ? malloc(pktout.maxlen+APIEXTRA) : - realloc(pktout.data, pktout.maxlen+APIEXTRA)); +static void ssh2_pkt_ensure(int length) { + if (pktout.maxlen < length) { + pktout.maxlen = length + 256; + pktout.data = (pktout.data == NULL ? smalloc(pktout.maxlen+APIEXTRA) : + srealloc(pktout.data, pktout.maxlen+APIEXTRA)); if (!pktout.data) fatalbox("Out of memory"); } +} +static void ssh2_pkt_adddata(void *data, int len) { + pktout.length += len; + ssh2_pkt_ensure(pktout.length); 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); + int i, n = (ssh1_bignum_bitcount(b)+7)/8; + p = smalloc(n + 1); if (!p) fatalbox("out of memory"); p[0] = 0; - for (i = 0; i < n; i++) { - p[i*2+1] = (b[n-i] >> 8) & 0xFF; - p[i*2+2] = (b[n-i] ) & 0xFF; - } + for (i = 1; i <= n; i++) + p[i] = bignum_byte(b, n-i); i = 0; - while (p[i] == 0 && (p[i+1] & 0x80) == 0) + while (i <= n && p[i] == 0 && (p[i+1] & 0x80) == 0) i++; - memmove(p, p+i, n*2+1-i); - *len = n*2+1-i; + memmove(p, p+i, n+1-i); + *len = n+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); ssh2_pkt_addstring_start(); ssh2_pkt_addstring_data(p, len); - free(p); + sfree(p); } -void ssh2_pkt_send(void) { + +/* + * Construct an SSH2 final-form packet: compress it, encrypt it, + * put the MAC on it. Final packet, ready to be sent, is stored in + * pktout.data. Total length is returned. + */ +static int ssh2_pkt_construct(void) { int cipherblk, maclen, padding, i; static unsigned long outgoing_sequence = 0; /* + * Compress packet payload. + */ +#if 0 + debug(("Pre-compression payload:\r\n")); + for (i = 5; i < pktout.length; i++) + debug((" %02x", (unsigned char)pktout.data[i])); + debug(("\r\n")); +#endif + { + unsigned char *newpayload; + int newlen; + if (cscomp && cscomp->compress(pktout.data+5, pktout.length-5, + &newpayload, &newlen)) { + pktout.length = 5; + ssh2_pkt_adddata(newpayload, newlen); + sfree(newpayload); + } + } + + /* * Add padding. At least four bytes, and must also bring total * length (minus MAC) up to a multiple of the block size. */ - cipherblk = cipher ? cipher->blksize : 8; /* block size */ + cipherblk = cscipher ? cscipher->blksize : 8; /* block size */ cipherblk = cipherblk < 8 ? 8 : cipherblk; /* or 8 if blksize < 8 */ padding = 4; padding += (cipherblk - (pktout.length + padding) % cipherblk) % cipherblk; + maclen = csmac ? csmac->len : 0; + ssh2_pkt_ensure(pktout.length + padding + maclen); pktout.data[4] = padding; for (i = 0; i < padding; i++) pktout.data[pktout.length + i] = random_byte(); @@ -917,9 +953,49 @@ void ssh2_pkt_send(void) { if (cscipher) cscipher->encrypt(pktout.data, pktout.length + padding); - maclen = csmac ? csmac->len : 0; - s_write(pktout.data, pktout.length + padding + maclen); + /* Ready-to-send packet starts at pktout.data. We return length. */ + return pktout.length + padding + maclen; +} + +/* + * Construct and send an SSH2 packet immediately. + */ +static void ssh2_pkt_send(void) { + int len = ssh2_pkt_construct(); + sk_write(s, pktout.data, len); +} + +/* + * Construct an SSH2 packet and add it to a deferred data block. + * Useful for sending multiple packets in a single sk_write() call, + * to prevent a traffic-analysing listener from being able to work + * out the length of any particular packet (such as the password + * packet). + * + * Note that because SSH2 sequence-numbers its packets, this can + * NOT be used as an m4-style `defer' allowing packets to be + * constructed in one order and sent in another. + */ +static void ssh2_pkt_defer(void) { + int len = ssh2_pkt_construct(); + if (deferred_len + len > deferred_size) { + deferred_size = deferred_len + len + 128; + deferred_send_data = srealloc(deferred_send_data, deferred_size); + } + memcpy(deferred_send_data+deferred_len, pktout.data, len); + deferred_len += len; +} + +/* + * Send the whole deferred data block constructed by + * ssh2_pkt_defer(). + */ +static void ssh2_pkt_defersend(void) { + sk_write(s, deferred_send_data, deferred_len); + deferred_len = deferred_size = 0; + sfree(deferred_send_data); + deferred_send_data = NULL; } #if 0 @@ -931,22 +1007,22 @@ void bndebug(char *string, Bignum b) { for (i = 0; i < len; i++) debug((" %02x", p[i])); debug(("\r\n")); - free(p); + sfree(p); } #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); sha_string(s, p, len); - free(p); + sfree(p); } /* * 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?) */ @@ -954,7 +1030,15 @@ unsigned long ssh2_pkt_getuint32(void) { pktin.savedpos += 4; return value; } -void ssh2_pkt_getstring(char **p, int *length) { +static int ssh2_pkt_getbool(void) { + unsigned long value; + if (pktin.length - pktin.savedpos < 1) + return 0; /* arrgh, no way to decline (FIXME?) */ + value = pktin.data[pktin.savedpos] != 0; + pktin.savedpos++; + return value; +} +static void ssh2_pkt_getstring(char **p, int *length) { *p = NULL; if (pktin.length - pktin.savedpos < 4) return; @@ -965,9 +1049,9 @@ 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; + int length; Bignum b; ssh2_pkt_getstring(&p, &length); @@ -977,44 +1061,39 @@ Bignum ssh2_pkt_getmp(void) { 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; - if (j & 1) - b[j/2+1] |= ((unsigned char)p[i]) << 8; - else - b[j/2+1] |= ((unsigned char)p[i]); - } + b = bignum_from_bytes(p, length); return b; } -static int do_ssh_init(void) { - char c, *vsp; - char version[10]; - char vstring[80]; - char vlog[sizeof(vstring)+20]; - int i; +static int do_ssh_init(unsigned char c) { + static char *vsp; + static char version[10]; + static char vstring[80]; + static char vlog[sizeof(vstring)+20]; + static int i; -#ifdef FWHACK + crBegin; + + /* Search for the string "SSH-" in the input. */ i = 0; - while (s_read(&c, 1) == 1) { - if (c == 'S' && i < 2) i++; - else if (c == 'S' && i == 2) i = 2; - else if (c == 'H' && i == 2) break; + while (1) { + static const int transS[] = { 1, 2, 2, 1 }; + static const int transH[] = { 0, 0, 3, 0 }; + static const int transminus[] = { 0, 0, 0, -1 }; + if (c == 'S') i = transS[i]; + else if (c == 'H') i = transH[i]; + else if (c == '-') i = transminus[i]; else i = 0; + if (i < 0) + break; + crReturn(1); /* get another character */ } -#else - if (s_read(&c,1) != 1 || c != 'S') return 0; - if (s_read(&c,1) != 1 || c != 'S') return 0; - if (s_read(&c,1) != 1 || c != 'H') return 0; -#endif + strcpy(vstring, "SSH-"); vsp = vstring+4; - if (s_read(&c,1) != 1 || c != '-') return 0; i = 0; while (1) { - if (s_read(&c,1) != 1) - return 0; + crReturn(1); /* get another char */ if (vsp < vstring+sizeof(vstring)-1) *vsp++ = c; if (i >= 0) { @@ -1028,6 +1107,9 @@ static int do_ssh_init(void) { break; } + ssh_agentfwd_enabled = FALSE; + rdpkt2_state.incoming_sequence = 0; + *vsp = 0; sprintf(vlog, "Server version: %s", vstring); vlog[strcspn(vlog, "\r\n")] = '\0'; @@ -1042,17 +1124,17 @@ static int do_ssh_init(void) { * This is a v2 server. Begin v2 protocol. */ char *verstring = "SSH-2.0-PuTTY"; - SHA_Init(&exhash); + SHA_Init(&exhashbase); /* * Hash our version string and their version string. */ - sha_string(&exhash, verstring, strlen(verstring)); - sha_string(&exhash, vstring, strcspn(vstring, "\r\n")); + sha_string(&exhashbase, verstring, strlen(verstring)); + sha_string(&exhashbase, vstring, strcspn(vstring, "\r\n")); sprintf(vstring, "%s\n", verstring); sprintf(vlog, "We claim version: %s", verstring); logevent(vlog); logevent("Using SSH protocol version 2"); - s_write(vstring, strlen(vstring)); + sk_write(s, vstring, strlen(vstring)); ssh_protocol = ssh2_protocol; ssh_version = 2; s_rdpkt = ssh2_rdpkt; @@ -1066,75 +1148,205 @@ static int do_ssh_init(void) { vlog[strcspn(vlog, "\r\n")] = '\0'; logevent(vlog); logevent("Using SSH protocol version 1"); - s_write(vstring, strlen(vstring)); + sk_write(s, vstring, strlen(vstring)); ssh_protocol = ssh1_protocol; ssh_version = 1; s_rdpkt = ssh1_rdpkt; } - ssh_send_ok = 0; - return 1; + ssh_state = SSH_STATE_BEFORE_SIZE; + + crFinish(0); } -/* - * Handle the key exchange and user authentication phases. - */ -static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) +static void ssh_gotdata(unsigned char *data, int datalen) { - int i, j, len; - unsigned char *rsabuf, *keystr1, *keystr2; - unsigned char cookie[8]; - struct RSAKey servkey, hostkey; - struct MD5Context md5c; - static unsigned long supported_ciphers_mask, supported_auths_mask; - 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) { - bombout(("Public key packet not received")); - crReturn(0); + /* + * To begin with, feed the characters one by one to the + * protocol initialisation / selection function do_ssh_init(). + * When that returns 0, we're done with the initial greeting + * exchange and can move on to packet discipline. + */ + while (1) { + int ret; + if (datalen == 0) + crReturnV; /* more data please */ + ret = do_ssh_init(*data); + data++; datalen--; + if (ret == 0) + break; } - logevent("Received public keys"); - - memcpy(cookie, pktin.body, 8); - - i = makekey(pktin.body+8, &servkey, &keystr1, 0); - j = makekey(pktin.body+8+i, &hostkey, &keystr2, 0); - /* - * Log the host key fingerprint. + * We emerge from that loop when the initial negotiation is + * over and we have selected an s_rdpkt function. Now pass + * everything to s_rdpkt, and then pass the resulting packets + * to the proper protocol handler. */ - { - char logmsg[80]; - logevent("Host key fingerprint is:"); - strcpy(logmsg, " "); - hostkey.comment = NULL; - rsa_fingerprint(logmsg+strlen(logmsg), sizeof(logmsg)-strlen(logmsg), - &hostkey); - logevent(logmsg); + if (datalen == 0) + crReturnV; + while (1) { + while (datalen > 0) { + if ( s_rdpkt(&data, &datalen) == 0 ) { + ssh_protocol(NULL, 0, 1); + if (ssh_state == SSH_STATE_CLOSED) { + return; + } + } + } + crReturnV; } + crFinishV; +} - supported_ciphers_mask = GET_32BIT(pktin.body+12+i+j); - supported_auths_mask = GET_32BIT(pktin.body+16+i+j); - - MD5Init(&md5c); - MD5Update(&md5c, keystr2, hostkey.bytes); - MD5Update(&md5c, keystr1, servkey.bytes); - MD5Update(&md5c, pktin.body, 8); - MD5Final(session_id, &md5c); - - for (i=0; i<32; i++) - session_key[i] = random_byte(); +static int ssh_receive(Socket skt, int urgent, char *data, int len) { + if (urgent==3) { + /* A socket error has occurred. */ + ssh_state = SSH_STATE_CLOSED; + sk_close(s); + s = NULL; + connection_fatal(data); + return 0; + } else if (!len) { + /* Connection has closed. */ + ssh_state = SSH_STATE_CLOSED; + sk_close(s); + s = NULL; + return 0; + } + ssh_gotdata (data, len); + if (ssh_state == SSH_STATE_CLOSED) { + if (s) { + sk_close(s); + s = NULL; + } + return 0; + } + return 1; +} - len = (hostkey.bytes > servkey.bytes ? hostkey.bytes : servkey.bytes); +/* + * Connect to specified host and port. + * Returns an error message, or NULL on success. + * Also places the canonical host name into `realhost'. + */ +static char *connect_to_host(char *host, int port, char **realhost) +{ + SockAddr addr; + char *err; +#ifdef FWHACK + char *FWhost; + int FWport; +#endif + + savedhost = smalloc(1+strlen(host)); + if (!savedhost) + fatalbox("Out of memory"); + strcpy(savedhost, host); + + if (port < 0) + port = 22; /* default ssh port */ + savedport = port; + +#ifdef FWHACK + FWhost = host; + FWport = port; + host = FWSTR; + port = 23; +#endif + + /* + * Try to find host. + */ + addr = sk_namelookup(host, realhost); + if ( (err = sk_addr_error(addr)) ) + return err; + +#ifdef FWHACK + *realhost = FWhost; +#endif + + /* + * Open socket. + */ + s = sk_new(addr, port, 0, 1, ssh_receive); + if ( (err = sk_socket_error(s)) ) + return err; + +#ifdef FWHACK + sk_write(s, "connect ", 8); + sk_write(s, FWhost, strlen(FWhost)); + { + char buf[20]; + sprintf(buf, " %d\n", FWport); + sk_write(s, buf, strlen(buf)); + } +#endif + + return NULL; +} + +/* + * Handle the key exchange and user authentication phases. + */ +static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) +{ + int i, j, len; + unsigned char *rsabuf, *keystr1, *keystr2; + unsigned char cookie[8]; + struct RSAKey servkey, hostkey; + struct MD5Context md5c; + static unsigned long supported_ciphers_mask, supported_auths_mask; + 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) { + bombout(("Public key packet not received")); + crReturn(0); + } + + logevent("Received public keys"); + + memcpy(cookie, pktin.body, 8); + + i = makekey(pktin.body+8, &servkey, &keystr1, 0); + j = makekey(pktin.body+8+i, &hostkey, &keystr2, 0); + + /* + * Log the host key fingerprint. + */ + { + char logmsg[80]; + logevent("Host key fingerprint is:"); + strcpy(logmsg, " "); + hostkey.comment = NULL; + rsa_fingerprint(logmsg+strlen(logmsg), sizeof(logmsg)-strlen(logmsg), + &hostkey); + logevent(logmsg); + } + + supported_ciphers_mask = GET_32BIT(pktin.body+12+i+j); + supported_auths_mask = GET_32BIT(pktin.body+16+i+j); + + MD5Init(&md5c); + MD5Update(&md5c, keystr2, hostkey.bytes); + MD5Update(&md5c, keystr1, servkey.bytes); + MD5Update(&md5c, pktin.body, 8); + MD5Final(session_id, &md5c); - rsabuf = malloc(len); + for (i=0; i<32; i++) + session_key[i] = random_byte(); + + len = (hostkey.bytes > servkey.bytes ? hostkey.bytes : servkey.bytes); + + rsabuf = smalloc(len); if (!rsabuf) fatalbox("Out of memory"); @@ -1147,13 +1359,13 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) */ int len = rsastr_len(&hostkey); char fingerprint[100]; - char *keystr = malloc(len); + char *keystr = smalloc(len); if (!keystr) fatalbox("Out of memory"); rsastr_fmt(keystr, &hostkey); rsa_fingerprint(fingerprint, sizeof(fingerprint), &hostkey); verify_ssh_host_key(savedhost, savedport, "rsa", keystr, fingerprint); - free(keystr); + sfree(keystr); } for (i=0; i<32; i++) { @@ -1172,11 +1384,17 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) logevent("Encrypted session key"); - cipher_type = cfg.cipher == CIPHER_BLOWFISH ? SSH_CIPHER_BLOWFISH : - cfg.cipher == CIPHER_DES ? SSH_CIPHER_DES : - SSH_CIPHER_3DES; + switch (cfg.cipher) { + case CIPHER_BLOWFISH: cipher_type = SSH_CIPHER_BLOWFISH; break; + case CIPHER_DES: cipher_type = SSH_CIPHER_DES; break; + case CIPHER_3DES: cipher_type = SSH_CIPHER_3DES; break; + case CIPHER_AES: + c_write_str("AES not supported in SSH1, falling back to 3DES\r\n"); + cipher_type = SSH_CIPHER_3DES; + break; + } if ((supported_ciphers_mask & (1 << cipher_type)) == 0) { - c_write("Selected cipher not supported, falling back to 3DES\r\n", 53); + c_write_str("Selected cipher not supported, falling back to 3DES\r\n"); cipher_type = SSH_CIPHER_3DES; } switch (cipher_type) { @@ -1195,7 +1413,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) logevent("Trying to enable encryption..."); - free(rsabuf); + sfree(rsabuf); cipher = cipher_type == SSH_CIPHER_BLOWFISH ? &ssh_blowfish_ssh1 : cipher_type == SSH_CIPHER_DES ? &ssh_des : @@ -1216,7 +1434,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) static int pos = 0; static char c; if ((flags & FLAG_INTERACTIVE) && !*cfg.username) { - c_write("login as: ", 10); + c_write_str("login as: "); ssh_send_ok = 1; while (pos >= 0) { crWaitUntil(!ispkt); @@ -1227,13 +1445,13 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) break; case 8: case 127: if (pos > 0) { - c_write("\b \b", 3); + c_write_str("\b \b"); pos--; } break; case 21: case 27: while (pos > 0) { - c_write("\b \b", 3); + c_write_str("\b \b"); pos--; } break; @@ -1250,23 +1468,23 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) break; } } - c_write("\r\n", 2); + c_write_str("\r\n"); username[strcspn(username, "\n\r")] = '\0'; } else { - char stuff[200]; strncpy(username, cfg.username, 99); username[99] = '\0'; - if ((flags & FLAG_VERBOSE) || (flags & FLAG_INTERACTIVE)) { - sprintf(stuff, "Sent username \"%s\".\r\n", username); - c_write(stuff, strlen(stuff)); - } } send_packet(SSH1_CMSG_USER, PKT_STR, username, PKT_END); { - char userlog[20+sizeof(username)]; + char userlog[22+sizeof(username)]; sprintf(userlog, "Sent username \"%s\"", username); logevent(userlog); + if (flags & FLAG_INTERACTIVE && + (!((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)))) { + strcat(userlog, "\r\n"); + c_write_str(userlog); + } } } @@ -1300,7 +1518,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) /* Request the keys held by the agent. */ PUT_32BIT(request, 1); - request[4] = SSH_AGENTC_REQUEST_RSA_IDENTITIES; + request[4] = SSH1_AGENTC_REQUEST_RSA_IDENTITIES; agent_query(request, 5, &r, &responselen); response = (unsigned char *)r; if (response) { @@ -1339,10 +1557,10 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) len += ssh1_bignum_length(challenge); len += 16; /* session id */ len += 4; /* response format */ - agentreq = malloc(4 + len); + agentreq = smalloc(4 + len); PUT_32BIT(agentreq, len); q = agentreq + 4; - *q++ = SSH_AGENTC_RSA_CHALLENGE; + *q++ = SSH1_AGENTC_RSA_CHALLENGE; PUT_32BIT(q, ssh1_bignum_bitcount(key.modulus)); q += 4; q += ssh1_write_bignum(q, key.exponent); @@ -1351,28 +1569,27 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) memcpy(q, session_id, 16); q += 16; PUT_32BIT(q, 1); /* response format */ agent_query(agentreq, len+4, &ret, &retlen); - free(agentreq); + sfree(agentreq); if (ret) { - if (ret[4] == SSH_AGENT_RSA_RESPONSE) { + if (ret[4] == SSH1_AGENT_RSA_RESPONSE) { logevent("Sending Pageant's response"); send_packet(SSH1_CMSG_AUTH_RSA_RESPONSE, PKT_DATA, ret+5, 16, PKT_END); - free(ret); + sfree(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_str("Authenticated using RSA key \""); c_write(commentp, commentlen); - c_write("\" from agent\r\n", 14); + c_write_str("\" from agent\r\n"); } authed = TRUE; } else logevent("Pageant's response not accepted"); } else { logevent("Pageant failed to answer challenge"); - free(ret); + sfree(ret); } } else { logevent("No reply received from Pageant"); @@ -1401,7 +1618,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) if (pktin.type != SSH1_SMSG_AUTH_TIS_CHALLENGE) { logevent("TIS authentication declined"); if (flags & FLAG_INTERACTIVE) - c_write("TIS authentication refused.\r\n", 29); + c_write_str("TIS authentication refused.\r\n"); } else { int challengelen = ((pktin.body[0] << 24) | (pktin.body[1] << 16) | @@ -1423,7 +1640,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) crWaitUntil(ispkt); if (pktin.type != SSH1_SMSG_AUTH_CCARD_CHALLENGE) { logevent("CryptoCard authentication declined"); - c_write("CryptoCard authentication refused.\r\n", 29); + c_write_str("CryptoCard authentication refused.\r\n"); } else { int challengelen = ((pktin.body[0] << 24) | (pktin.body[1] << 16) | @@ -1445,14 +1662,14 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) if (pwpkt_type == SSH1_CMSG_AUTH_RSA) { char *comment = NULL; if (flags & FLAG_VERBOSE) - c_write("Trying public key authentication.\r\n", 35); + c_write_str("Trying public key authentication.\r\n"); if (!rsakey_encrypted(cfg.keyfile, &comment)) { if (flags & FLAG_VERBOSE) - c_write("No passphrase required.\r\n", 25); + c_write_str("No passphrase required.\r\n"); goto tryauth; } sprintf(prompt, "Passphrase for key \"%.100s\": ", comment); - free(comment); + sfree(comment); } if (ssh_get_password) { @@ -1468,7 +1685,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) crReturn(1); } } else { - c_write(prompt, strlen(prompt)); + c_write_str(prompt); pos = 0; ssh_send_ok = 1; while (pos >= 0) { @@ -1496,7 +1713,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) break; } } - c_write("\r\n", 2); + c_write_str("\r\n"); } tryauth: @@ -1513,13 +1730,13 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) tried_publickey = 1; i = loadrsakey(cfg.keyfile, &pubkey, password); if (i == 0) { - c_write("Couldn't load public key from ", 30); - c_write(cfg.keyfile, strlen(cfg.keyfile)); - c_write(".\r\n", 3); + c_write_str("Couldn't load public key from "); + c_write_str(cfg.keyfile); + c_write_str(".\r\n"); continue; /* go and try password */ } if (i == -1) { - c_write("Wrong passphrase.\r\n", 19); + c_write_str("Wrong passphrase.\r\n"); tried_publickey = 0; continue; /* try again */ } @@ -1532,7 +1749,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) crWaitUntil(ispkt); if (pktin.type == SSH1_SMSG_FAILURE) { - c_write("Server refused our public key.\r\n", 32); + c_write_str("Server refused our public key.\r\n"); continue; /* go and try password */ } if (pktin.type != SSH1_SMSG_AUTH_RSA_CHALLENGE) { @@ -1543,9 +1760,8 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) response = rsadecrypt(challenge, &pubkey); freebn(pubkey.private_exponent); /* burn the evidence */ - for (i = 0; i < 32; i += 2) { - buffer[i] = response[16-i/2] >> 8; - buffer[i+1] = response[16-i/2] & 0xFF; + for (i = 0; i < 32; i++) { + buffer[i] = bignum_byte(response, 31-i); } MD5Init(&md5c); @@ -1559,8 +1775,7 @@ 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("Failed to authenticate with our public key.\r\n", - 45); + c_write_str("Failed to authenticate with our public key.\r\n"); continue; /* go and try password */ } else if (pktin.type != SSH1_SMSG_SUCCESS) { bombout(("Bizarre response to RSA authentication response")); @@ -1576,7 +1791,7 @@ 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("Access denied\r\n", 15); + c_write_str("Access denied\r\n"); logevent("Authentication refused"); } else if (pktin.type == SSH1_MSG_DISCONNECT) { logevent("Received disconnect request"); @@ -1593,6 +1808,36 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) crFinish(1); } +void sshfwd_close(struct ssh_channel *c) { + if (c) { + if (ssh_version == 1) { + send_packet(SSH1_MSG_CHANNEL_CLOSE, PKT_INT, c->remoteid, PKT_END); + } else { + ssh2_pkt_init(SSH2_MSG_CHANNEL_CLOSE); + ssh2_pkt_adduint32(c->remoteid); + ssh2_pkt_send(); + } + c->closes = 1; + if (c->type == CHAN_X11) { + c->u.x11.s = NULL; + logevent("X11 connection terminated"); + } + } +} + +void sshfwd_write(struct ssh_channel *c, char *buf, int len) { + if (ssh_version == 1) { + send_packet(SSH1_MSG_CHANNEL_DATA, + PKT_INT, c->remoteid, + PKT_INT, len, + PKT_DATA, buf, len, + PKT_END); + } else { + ssh2_add_channel_data(c, buf, len); + ssh2_try_send(c); + } +} + static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { crBegin; @@ -1613,8 +1858,30 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { crReturnV; } else if (pktin.type == SSH1_SMSG_FAILURE) { logevent("Agent forwarding refused"); - } else + } else { logevent("Agent forwarding enabled"); + ssh_agentfwd_enabled = TRUE; + } + } + + if (cfg.x11_forward) { + char proto[20], data[64]; + logevent("Requesting X11 forwarding"); + x11_invent_auth(proto, sizeof(proto), data, sizeof(data)); + send_packet(SSH1_CMSG_X11_REQUEST_FORWARDING, + PKT_STR, proto, PKT_STR, data, + PKT_INT, 0, + 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("X11 forwarding refused"); + } else { + logevent("X11 forwarding enabled"); + ssh_X11_fwd_enabled = TRUE; + } } if (!cfg.nopty) { @@ -1630,9 +1897,27 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { bombout(("Protocol confusion")); crReturnV; } else if (pktin.type == SSH1_SMSG_FAILURE) { - c_write("Server refused to allocate pty\r\n", 32); + c_write_str("Server refused to allocate pty\r\n"); + ssh_editing = ssh_echoing = 1; } logevent("Allocated pty"); + } else { + ssh_editing = ssh_echoing = 1; + } + + if (cfg.compression) { + send_packet(SSH1_CMSG_REQUEST_COMPRESSION, PKT_INT, 6, 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) { + c_write_str("Server refused to compress\r\n"); + } + logevent("Started compression"); + ssh1_compressing = TRUE; + zlib_compress_init(); + zlib_decompress_init(); } if (*cfg.remote_cmd) @@ -1644,43 +1929,97 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { ssh_state = SSH_STATE_SESSION; if (size_needed) ssh_size(); + if (eof_needed) + ssh_special(TS_EOF); + ldisc_send(NULL, 0); /* cause ldisc to notice changes */ 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_writedata(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"); + crReturnV; + } else if (pktin.type == SSH1_SMSG_X11_OPEN) { + /* Remote side is trying to open a channel to talk to our + * X-Server. Give them back a local channel number. */ + unsigned i; + struct ssh_channel *c, *d; + enum234 e; + + logevent("Received X11 connect request"); + /* Refuse if X11 forwarding is disabled. */ + if (!ssh_X11_fwd_enabled) { + send_packet(SSH1_MSG_CHANNEL_OPEN_FAILURE, + PKT_INT, GET_32BIT(pktin.body), + PKT_END); + logevent("Rejected X11 connect request"); + } else { + c = smalloc(sizeof(struct ssh_channel)); + + if ( x11_init(&c->u.x11.s, cfg.x11_display, c) != NULL ) { + logevent("opening X11 forward connection failed"); + sfree(c); + send_packet(SSH1_MSG_CHANNEL_OPEN_FAILURE, + PKT_INT, GET_32BIT(pktin.body), + PKT_END); + } else { + logevent("opening X11 forward connection succeeded"); + for (i=1, d = first234(ssh_channels, &e); d; d = next234(&e)) { + if (d->localid > i) + break; /* found a free number */ + i = d->localid + 1; + } + c->remoteid = GET_32BIT(pktin.body); + c->localid = i; + c->closes = 0; + c->type = CHAN_X11; /* identify channel type */ + add234(ssh_channels, c); + send_packet(SSH1_MSG_CHANNEL_OPEN_CONFIRMATION, + PKT_INT, c->remoteid, PKT_INT, c->localid, + PKT_END); + logevent("Opened X11 forward channel"); + } + } } 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; + unsigned i; 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) { + + /* Refuse if agent forwarding is disabled. */ + if (!ssh_agentfwd_enabled) { + send_packet(SSH1_MSG_CHANNEL_OPEN_FAILURE, + PKT_INT, GET_32BIT(pktin.body), + PKT_END); + } else { + i = 1; + for (c = first234(ssh_channels, &e); c; c = next234(&e)) { + if (c->localid > i) + break; /* found a free number */ + i = c->localid + 1; + } + c = smalloc(sizeof(struct ssh_channel)); + c->remoteid = GET_32BIT(pktin.body); + c->localid = i; + c->closes = 0; + c->type = CHAN_AGENT; /* 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; @@ -1689,10 +2028,16 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { int closetype; closetype = (pktin.type == SSH1_MSG_CHANNEL_CLOSE ? 1 : 2); send_packet(pktin.type, PKT_INT, c->remoteid, PKT_END); + if ((c->closes == 0) && (c->type == CHAN_X11)) { + logevent("X11 connection closed"); + assert(c->u.x11.s != NULL); + x11_close(c->u.x11.s); + c->u.x11.s = NULL; + } c->closes |= closetype; if (c->closes == 3) { del234(ssh_channels, c); - free(c); + sfree(c); } } } else if (pktin.type == SSH1_MSG_CHANNEL_DATA) { @@ -1704,7 +2049,10 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { c = find234(ssh_channels, &i, ssh_channelfind); if (c) { switch(c->type) { - case SSH1_SMSG_AGENT_OPEN: + case CHAN_X11: + x11_send(c->u.x11.s, p, len); + break; + case CHAN_AGENT: /* Data for an agent message. Buffer it. */ while (len > 0) { if (c->u.a.lensofar < 4) { @@ -1714,7 +2062,7 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { } 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); + c->u.a.message = smalloc(c->u.a.totallen); memcpy(c->u.a.message, c->u.a.msglen, 4); } if (c->u.a.lensofar >= 4 && len > 0) { @@ -1740,8 +2088,8 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { PKT_DATA, sentreply, replylen, PKT_END); if (reply) - free(reply); - free(c->u.a.message); + sfree(reply); + sfree(c->u.a.message); c->u.a.lensofar = 0; } } @@ -1760,8 +2108,13 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { crReturnV; } } else { - send_packet(SSH1_CMSG_STDIN_DATA, - PKT_INT, inlen, PKT_DATA, in, inlen, PKT_END); + while (inlen > 0) { + int len = min(inlen, 512); + send_packet(SSH1_CMSG_STDIN_DATA, + PKT_INT, len, PKT_DATA, in, len, PKT_END); + in += len; + inlen -= len; + } } } @@ -1771,7 +2124,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) { /* @@ -1798,14 +2151,14 @@ 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 *sessid, char chr, char *keyspace) { SHA_State s; /* First 20 bytes. */ SHA_Init(&s); sha_mpint(&s, K); SHA_Bytes(&s, H, 20); SHA_Bytes(&s, &chr, 1); - SHA_Bytes(&s, H, 20); + SHA_Bytes(&s, sessid, 20); SHA_Final(&s, keyspace); /* Next 20 bytes. */ SHA_Init(&s); @@ -1820,38 +2173,59 @@ void ssh2_mkkey(Bignum K, char *H, char chr, char *keyspace) { */ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) { - static int i, len; + static int i, j, len, nbits; static char *str; - static Bignum e, f, K; - static const struct ssh_cipher *cscipher_tobe = NULL; - static const struct ssh_cipher *sccipher_tobe = NULL; + static Bignum p, g, e, f, K; + static int kex_init_value, kex_reply_value; + static const struct ssh_mac **maclist; + static int nmacs; + static const struct ssh2_cipher *cscipher_tobe = NULL; + static const struct ssh2_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 void *hkey; /* actual host key */ static unsigned char exchange_hash[20]; static unsigned char keyspace[40]; - static const struct ssh_cipher *preferred_cipher; + static const struct ssh2_ciphers *preferred_cipher; + static const struct ssh_compress *preferred_comp; + static int first_kex; crBegin; random_init(); + first_kex = 1; /* - * Set up the preferred cipher. + * Set up the preferred cipher and compression. */ if (cfg.cipher == CIPHER_BLOWFISH) { - preferred_cipher = &ssh_blowfish_ssh2; + preferred_cipher = &ssh2_blowfish; } else if (cfg.cipher == CIPHER_DES) { logevent("Single DES not supported in SSH2; using 3DES"); - preferred_cipher = &ssh_3des_ssh2; + preferred_cipher = &ssh2_3des; } else if (cfg.cipher == CIPHER_3DES) { - preferred_cipher = &ssh_3des_ssh2; + preferred_cipher = &ssh2_3des; + } else if (cfg.cipher == CIPHER_AES) { + preferred_cipher = &ssh2_aes; } else { /* Shouldn't happen, but we do want to initialise to _something_. */ - preferred_cipher = &ssh_3des_ssh2; + preferred_cipher = &ssh2_3des; } + if (cfg.compression) + preferred_comp = &ssh_zlib; + else + preferred_comp = &ssh_comp_none; + + /* + * 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: /* @@ -1877,45 +2251,51 @@ 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)+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(","); + const struct ssh2_ciphers *c = i==0 ? preferred_cipher : ciphers[i-1]; + for (j = 0; j < c->nciphers; j++) { + ssh2_pkt_addstring_str(c->list[j]->name); + if (i < lenof(ciphers) || j < c->nciphers-1) + ssh2_pkt_addstring_str(","); + } } /* List server->client encryption algorithms. */ ssh2_pkt_addstring_start(); 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(","); + const struct ssh2_ciphers *c = i==0 ? preferred_cipher : ciphers[i-1]; + for (j = 0; j < c->nciphers; j++) { + ssh2_pkt_addstring_str(c->list[j]->name); + if (i < lenof(ciphers) || j < c->nciphers-1) + 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. */ ssh2_pkt_addstring_start(); - for (i = 0; i < lenof(compressions); i++) { - ssh2_pkt_addstring_str(compressions[i]->name); - if (i < lenof(compressions)-1) + for (i = 0; i < lenof(compressions)+1; i++) { + const struct ssh_compress *c = i==0 ? preferred_comp : compressions[i-1]; + ssh2_pkt_addstring_str(c->name); + if (i < lenof(compressions)) ssh2_pkt_addstring_str(","); } /* List server->client compression algorithms. */ ssh2_pkt_addstring_start(); - for (i = 0; i < lenof(compressions); i++) { - ssh2_pkt_addstring_str(compressions[i]->name); - if (i < lenof(compressions)-1) + for (i = 0; i < lenof(compressions)+1; i++) { + const struct ssh_compress *c = i==0 ? preferred_comp : compressions[i-1]; + ssh2_pkt_addstring_str(c->name); + if (i < lenof(compressions)) ssh2_pkt_addstring_str(","); } /* List client->server languages. Empty list. */ @@ -1926,7 +2306,10 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) ssh2_pkt_addbool(FALSE); /* Reserved. */ ssh2_pkt_adduint32(0); + + exhash = exhashbase; sha_string(&exhash, pktout.data+5, pktout.length-5); + ssh2_pkt_send(); if (!ispkt) crWaitUntil(ispkt); @@ -1959,69 +2342,114 @@ 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)+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; + const struct ssh2_ciphers *c = i==0 ? preferred_cipher : ciphers[i-1]; + for (j = 0; j < c->nciphers; j++) { + if (in_commasep_string(c->list[j]->name, str, len)) { + cscipher_tobe = c->list[j]; + break; + } } + if (cscipher_tobe) + break; } ssh2_pkt_getstring(&str, &len); /* server->client cipher */ 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; + const struct ssh2_ciphers *c = i==0 ? preferred_cipher : ciphers[i-1]; + for (j = 0; j < c->nciphers; j++) { + if (in_commasep_string(c->list[j]->name, str, len)) { + sccipher_tobe = c->list[j]; + break; + } } + if (sccipher_tobe) + 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; } } ssh2_pkt_getstring(&str, &len); /* client->server compression */ - for (i = 0; i < lenof(compressions); i++) { - if (in_commasep_string(compressions[i]->name, str, len)) { - cscomp_tobe = compressions[i]; + for (i = 0; i < lenof(compressions)+1; i++) { + const struct ssh_compress *c = i==0 ? preferred_comp : compressions[i-1]; + if (in_commasep_string(c->name, str, len)) { + cscomp_tobe = c; break; } } ssh2_pkt_getstring(&str, &len); /* server->client compression */ - for (i = 0; i < lenof(compressions); i++) { - if (in_commasep_string(compressions[i]->name, str, len)) { - sccomp_tobe = compressions[i]; + for (i = 0; i < lenof(compressions)+1; i++) { + const struct ssh_compress *c = i==0 ? preferred_comp : compressions[i-1]; + if (in_commasep_string(c->name, str, len)) { + sccomp_tobe = c; break; } } /* - * Currently we only support Diffie-Hellman and DSS, so let's - * bomb out if those aren't selected. + * If we're doing Diffie-Hellman group exchange, start by + * requesting a group. */ - if (kex != &ssh_diffiehellman || hostkey != &ssh_dss) { - bombout(("internal fault: chaos in SSH 2 transport layer")); - crReturn(0); + if (kex == &ssh_diffiehellman_gex) { + int csbits, scbits; + + logevent("Doing Diffie-Hellman group exchange"); + /* + * Work out number of bits. We start with the maximum key + * length of either cipher... + */ + csbits = cscipher_tobe->keylen; + scbits = sccipher_tobe->keylen; + nbits = (csbits > scbits ? csbits : scbits); + /* The keys only have 160-bit entropy, since they're based on + * a SHA-1 hash. So cap the key size at 160 bits. */ + if (nbits > 160) nbits = 160; + /* + * ... and then work out how big a DH group we will need to + * allow that much data. + */ + nbits = 512 << ((nbits-1) / 64); + ssh2_pkt_init(SSH2_MSG_KEX_DH_GEX_REQUEST); + ssh2_pkt_adduint32(nbits); + ssh2_pkt_send(); + + crWaitUntil(ispkt); + if (pktin.type != SSH2_MSG_KEX_DH_GEX_GROUP) { + bombout(("expected key exchange group packet from server")); + crReturn(0); + } + p = ssh2_pkt_getmp(); + g = ssh2_pkt_getmp(); + dh_setup_group(p, g); + kex_init_value = SSH2_MSG_KEX_DH_GEX_INIT; + kex_reply_value = SSH2_MSG_KEX_DH_GEX_REPLY; + } else { + dh_setup_group1(); + kex_init_value = SSH2_MSG_KEXDH_INIT; + kex_reply_value = SSH2_MSG_KEXDH_REPLY; } + logevent("Doing Diffie-Hellman key exchange"); /* - * Now we begin the fun. Generate and send e for Diffie-Hellman. + * Now generate and send e for Diffie-Hellman. */ e = dh_create_e(); - ssh2_pkt_init(SSH2_MSG_KEXDH_INIT); + ssh2_pkt_init(kex_init_value); ssh2_pkt_addmp(e); ssh2_pkt_send(); crWaitUntil(ispkt); - if (pktin.type != SSH2_MSG_KEXDH_REPLY) { - bombout(("expected key exchange packet from server")); + if (pktin.type != kex_reply_value) { + bombout(("expected key exchange reply packet from server")); crReturn(0); } ssh2_pkt_getstring(&hostkeydata, &hostkeylen); @@ -2031,11 +2459,18 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) K = dh_find_K(f); sha_string(&exhash, hostkeydata, hostkeylen); + if (kex == &ssh_diffiehellman_gex) { + sha_uint32(&exhash, nbits); + sha_mpint(&exhash, p); + sha_mpint(&exhash, g); + } sha_mpint(&exhash, e); sha_mpint(&exhash, f); sha_mpint(&exhash, K); SHA_Final(&exhash, exchange_hash); + dh_cleanup(); + #if 0 debug(("Exchange hash is:\r\n")); for (i = 0; i < 20; i++) @@ -2043,8 +2478,8 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) debug(("\r\n")); #endif - hostkey->setkey(hostkeydata, hostkeylen); - if (!hostkey->verifysig(sigdata, siglen, exchange_hash, 20)) { + hkey = hostkey->newkey(hostkeydata, hostkeylen); + if (!hostkey->verifysig(hkey, sigdata, siglen, exchange_hash, 20)) { bombout(("Server failed host key check")); crReturn(0); } @@ -2062,14 +2497,17 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) * Authenticate remote host: verify host key. (We've already * checked the signature of the exchange hash.) */ - keystr = hostkey->fmtkey(); - fingerprint = hostkey->fingerprint(); + keystr = hostkey->fmtkey(hkey); + fingerprint = hostkey->fingerprint(hkey); verify_ssh_host_key(savedhost, savedport, hostkey->keytype, keystr, fingerprint); - logevent("Host key fingerprint is:"); - logevent(fingerprint); - free(fingerprint); - free(keystr); + if (first_kex) { /* don't bother logging this in rekeys */ + logevent("Host key fingerprint is:"); + logevent(fingerprint); + } + sfree(fingerprint); + sfree(keystr); + hostkey->freekey(hkey); /* * Send SSH2_MSG_NEWKEYS. @@ -2086,15 +2524,39 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) scmac = scmac_tobe; cscomp = cscomp_tobe; sccomp = sccomp_tobe; + cscomp->compress_init(); + sccomp->decompress_init(); + /* + * Set IVs after keys. Here we use the exchange hash from the + * _first_ key exchange. + */ + if (first_kex) + memcpy(ssh2_session_id, exchange_hash, sizeof(exchange_hash)); + ssh2_mkkey(K, exchange_hash, ssh2_session_id, 'C', keyspace); + cscipher->setcskey(keyspace); + ssh2_mkkey(K, exchange_hash, ssh2_session_id, 'D', keyspace); + sccipher->setsckey(keyspace); + ssh2_mkkey(K, exchange_hash, ssh2_session_id, 'A', keyspace); + cscipher->setcsiv(keyspace); + ssh2_mkkey(K, exchange_hash, ssh2_session_id, 'B', keyspace); + sccipher->setsciv(keyspace); + ssh2_mkkey(K, exchange_hash, ssh2_session_id, 'E', keyspace); + csmac->setcskey(keyspace); + ssh2_mkkey(K, exchange_hash, ssh2_session_id, 'F', keyspace); + scmac->setsckey(keyspace); + /* - * Set IVs after keys. + * If this is the first key exchange phase, we must pass the + * SSH2_MSG_NEWKEYS packet to the next layer, not because it + * wants to see it but because it will need time to initialise + * itself before it sees an actual packet. In subsequent key + * exchange phases, we don't pass SSH2_MSG_NEWKEYS on, because + * it would only confuse the layer above. */ - ssh2_mkkey(K, exchange_hash, 'C', keyspace); cscipher->setcskey(keyspace); - ssh2_mkkey(K, exchange_hash, 'D', keyspace); cscipher->setsckey(keyspace); - ssh2_mkkey(K, exchange_hash, 'A', keyspace); cscipher->setcsiv(keyspace); - ssh2_mkkey(K, exchange_hash, 'B', keyspace); sccipher->setsciv(keyspace); - ssh2_mkkey(K, exchange_hash, 'E', keyspace); csmac->setcskey(keyspace); - ssh2_mkkey(K, exchange_hash, 'F', keyspace); scmac->setsckey(keyspace); + if (!first_kex) { + crReturn(0); + } + first_kex = 0; /* * Now we're encrypting. Begin returning 1 to the protocol main @@ -2102,21 +2564,77 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) * transport. If we ever see a KEXINIT, we must go back to the * start. */ - do { + while (!(ispkt && pktin.type == SSH2_MSG_KEXINIT)) { crReturn(1); - } while (!(ispkt && pktin.type == SSH2_MSG_KEXINIT)); + } + logevent("Server initiated key re-exchange"); goto begin_key_exchange; crFinish(1); } /* + * Add data to an SSH2 channel output buffer. + */ +static void ssh2_add_channel_data(struct ssh_channel *c, char *buf, int len) { + if (c->v2.outbufsize < + c->v2.outbuflen + len) { + c->v2.outbufsize = + c->v2.outbuflen + len + 1024; + c->v2.outbuffer = srealloc(c->v2.outbuffer, + c->v2.outbufsize); + } + memcpy(c->v2.outbuffer + c->v2.outbuflen, + buf, len); + c->v2.outbuflen += len; +} + +/* + * Attempt to send data on an SSH2 channel. + */ +static void ssh2_try_send(struct ssh_channel *c) { + while (c->v2.remwindow > 0 && + c->v2.outbuflen > 0) { + unsigned len = c->v2.remwindow; + if (len > c->v2.outbuflen) + len = c->v2.outbuflen; + if (len > c->v2.remmaxpkt) + len = c->v2.remmaxpkt; + ssh2_pkt_init(SSH2_MSG_CHANNEL_DATA); + ssh2_pkt_adduint32(c->remoteid); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(c->v2.outbuffer, len); + ssh2_pkt_send(); + c->v2.outbuflen -= len; + memmove(c->v2.outbuffer, c->v2.outbuffer+len, + c->v2.outbuflen); + c->v2.remwindow -= len; + } +} + +/* * Handle the SSH2 userauth and connection layers. */ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) { static unsigned long remote_winsize; static unsigned long remote_maxpkt; + static enum { + AUTH_INVALID, AUTH_PUBLICKEY_AGENT, AUTH_PUBLICKEY_FILE, AUTH_PASSWORD + } method; + static enum { + AUTH_TYPE_NONE, + AUTH_TYPE_PUBLICKEY, + AUTH_TYPE_PUBLICKEY_OFFER_LOUD, + AUTH_TYPE_PUBLICKEY_OFFER_QUIET, + AUTH_TYPE_PASSWORD + } type; + static int gotit, need_pw, can_pubkey, can_passwd; + static int tried_pubkey_config, tried_agent; + static int we_are_in; + static char username[100]; + static char pwprompt[200]; + static char password[100]; crBegin; @@ -2133,22 +2651,40 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) } /* - * FIXME: currently we support only password authentication. - * (This places us technically in violation of the SSH2 spec. - * We must fix this.) + * We repeat this whole loop, including the username prompt, + * until we manage a successful authentication. If the user + * types the wrong _password_, they are sent back to the + * beginning to try another username. (If they specify a + * username in the config, they are never asked, even if they + * do give a wrong password.) + * + * I think this best serves the needs of + * + * - the people who have no configuration, no keys, and just + * want to try repeated (username,password) pairs until they + * type both correctly + * + * - people who have keys and configuration but occasionally + * need to fall back to passwords + * + * - people with a key held in Pageant, who might not have + * logged in to a particular machine before; so they want to + * type a username, and then _either_ their key will be + * accepted, _or_ they will type a password. If they mistype + * the username they will want to be able to get back and + * retype it! */ - while (1) { - /* - * Get a username and a password. - */ - static char username[100]; - static char password[100]; - static int pos = 0; + do { + static int pos; static char c; + /* + * Get a username. + */ + pos = 0; if ((flags & FLAG_INTERACTIVE) && !*cfg.username) { - c_write("login as: ", 10); - ssh_send_ok = 1; + c_write_str("login as: "); + ssh_send_ok = 1; while (pos >= 0) { crWaitUntilV(!ispkt); while (inlen--) switch (c = *in++) { @@ -2158,13 +2694,13 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) break; case 8: case 127: if (pos > 0) { - c_write("\b \b", 3); + c_write_str("\b \b"); pos--; } break; case 21: case 27: while (pos > 0) { - c_write("\b \b", 3); + c_write_str("\b \b"); pos--; } break; @@ -2174,87 +2710,463 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) break; default: if (((c >= ' ' && c <= '~') || - ((unsigned char)c >= 160)) && pos < 40) { + ((unsigned char)c >= 160)) && pos < 40) { username[pos++] = c; c_write(&c, 1); } break; } } - c_write("\r\n", 2); + c_write_str("\r\n"); username[strcspn(username, "\n\r")] = '\0'; } else { char stuff[200]; strncpy(username, cfg.username, 99); username[99] = '\0'; - if ((flags & FLAG_VERBOSE) || (flags & FLAG_INTERACTIVE)) { + if ((flags & FLAG_VERBOSE) || (flags & FLAG_INTERACTIVE)) { sprintf(stuff, "Using username \"%s\".\r\n", username); - c_write(stuff, strlen(stuff)); + c_write_str(stuff); } } - if (ssh_get_password) { - char prompt[200]; - sprintf(prompt, "%.90s@%.90s's password: ", username, savedhost); - if (!ssh_get_password(prompt, password, sizeof(password))) { - /* - * get_password failed to get a password (for - * example because one was supplied on the command - * line which has already failed to work). - * Terminate. - */ - logevent("No more passwords to try"); - ssh_state = SSH_STATE_CLOSED; - crReturnV; - } - } else { - c_write("password: ", 10); - ssh_send_ok = 1; + /* + * Send an authentication request using method "none": (a) + * just in case it succeeds, and (b) so that we know what + * authentication methods we can usefully try next. + */ + ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); + ssh2_pkt_addstring(username); + ssh2_pkt_addstring("ssh-connection"); /* service requested */ + ssh2_pkt_addstring("none"); /* method */ + ssh2_pkt_send(); + type = AUTH_TYPE_NONE; + gotit = FALSE; + we_are_in = FALSE; + + tried_pubkey_config = FALSE; + tried_agent = FALSE; + + while (1) { + /* + * Wait for the result of the last authentication request. + */ + if (!gotit) + crWaitUntilV(ispkt); + while (pktin.type == SSH2_MSG_USERAUTH_BANNER) { + /* FIXME: should support this */ + crWaitUntilV(ispkt); + } + if (pktin.type == SSH2_MSG_USERAUTH_SUCCESS) { + logevent("Access granted"); + we_are_in = TRUE; + break; + } - pos = 0; - while (pos >= 0) { - crWaitUntilV(!ispkt); - while (inlen--) switch (c = *in++) { - case 10: case 13: - password[pos] = 0; - pos = -1; - break; - case 8: case 127: - if (pos > 0) - pos--; - break; - case 21: case 27: - pos = 0; - break; - case 3: case 4: - random_save_seed(); - exit(0); - break; - default: - if (((c >= ' ' && c <= '~') || - ((unsigned char)c >= 160)) && pos < 40) - password[pos++] = c; - break; - } - } - c_write("\r\n", 2); - } + if (pktin.type != SSH2_MSG_USERAUTH_FAILURE) { + bombout(("Strange packet received during authentication: type %d", + pktin.type)); + } - ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); - ssh2_pkt_addstring(username); - ssh2_pkt_addstring("ssh-connection"); /* service requested */ - ssh2_pkt_addstring("password"); - ssh2_pkt_addbool(FALSE); - ssh2_pkt_addstring(password); - ssh2_pkt_send(); + gotit = FALSE; + + /* + * OK, we're now sitting on a USERAUTH_FAILURE message, so + * we can look at the string in it and know what we can + * helpfully try next. + */ + { + char *methods; + int methlen; + ssh2_pkt_getstring(&methods, &methlen); + if (!ssh2_pkt_getbool()) { + /* + * We have received an unequivocal Access + * Denied. This can translate to a variety of + * messages: + * + * - if we'd just tried "none" authentication, + * it's not worth printing anything at all + * + * - if we'd just tried a public key _offer_, + * the message should be "Server refused our + * key" (or no message at all if the key + * came from Pageant) + * + * - if we'd just tried anything else, the + * message really should be "Access denied". + * + * Additionally, if we'd just tried password + * authentication, we should break out of this + * whole loop so as to go back to the username + * prompt. + */ + if (type == AUTH_TYPE_NONE) { + /* do nothing */ + } else if (type == AUTH_TYPE_PUBLICKEY_OFFER_LOUD || + type == AUTH_TYPE_PUBLICKEY_OFFER_QUIET) { + if (type == AUTH_TYPE_PUBLICKEY_OFFER_LOUD) + c_write_str("Server refused our key\r\n"); + logevent("Server refused public key"); + } else { + c_write_str("Access denied\r\n"); + logevent("Access denied"); + if (type == AUTH_TYPE_PASSWORD) { + we_are_in = FALSE; + break; + } + } + } else { + c_write_str("Further authentication required\r\n"); + logevent("Further authentication required"); + } - crWaitUntilV(ispkt); - if (pktin.type != SSH2_MSG_USERAUTH_SUCCESS) { - c_write("Access denied\r\n", 15); - logevent("Authentication refused"); - } else - break; - } + can_pubkey = in_commasep_string("publickey", methods, methlen); + can_passwd = in_commasep_string("password", methods, methlen); + } + + method = 0; + + if (!method && can_pubkey && agent_exists && !tried_agent) { + /* + * Attempt public-key authentication using Pageant. + */ + static unsigned char request[5], *response, *p; + static int responselen; + static int i, nkeys; + static int authed = FALSE; + void *r; + + tried_agent = TRUE; + + logevent("Pageant is running. Requesting keys."); + + /* Request the keys held by the agent. */ + PUT_32BIT(request, 1); + request[4] = SSH2_AGENTC_REQUEST_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 char *pkblob, *alg, *commentp; + static int pklen, alglen, commentlen; + static int siglen, retlen, len; + static char *q, *agentreq, *ret; + + { char buf[64]; sprintf(buf, "Trying Pageant key #%d", i); + logevent(buf); } + pklen = GET_32BIT(p); p += 4; + pkblob = p; p += pklen; + alglen = GET_32BIT(pkblob); + alg = pkblob + 4; + commentlen = GET_32BIT(p); p += 4; + commentp = p; p += commentlen; + ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); + ssh2_pkt_addstring(username); + ssh2_pkt_addstring("ssh-connection");/* service requested */ + ssh2_pkt_addstring("publickey");/* method */ + ssh2_pkt_addbool(FALSE); /* no signature included */ + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(alg, alglen); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(pkblob, pklen); + ssh2_pkt_send(); + + crWaitUntilV(ispkt); + if (pktin.type != SSH2_MSG_USERAUTH_PK_OK) { + logevent("Key refused"); + continue; + } + + c_write_str("Authenticating with public key \""); + c_write(commentp, commentlen); + c_write_str("\" from agent\r\n"); + + /* + * Server is willing to accept the key. + * Construct a SIGN_REQUEST. + */ + ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); + ssh2_pkt_addstring(username); + ssh2_pkt_addstring("ssh-connection"); /* service requested */ + ssh2_pkt_addstring("publickey"); /* method */ + ssh2_pkt_addbool(TRUE); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(alg, alglen); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(pkblob, pklen); + + siglen = pktout.length - 5 + 4 + 20; + len = 1; /* message type */ + len += 4 + pklen; /* key blob */ + len += 4 + siglen; /* data to sign */ + len += 4; /* flags */ + agentreq = smalloc(4 + len); + PUT_32BIT(agentreq, len); + q = agentreq + 4; + *q++ = SSH2_AGENTC_SIGN_REQUEST; + PUT_32BIT(q, pklen); q += 4; + memcpy(q, pkblob, pklen); q += pklen; + PUT_32BIT(q, siglen); q += 4; + /* Now the data to be signed... */ + PUT_32BIT(q, 20); q += 4; + memcpy(q, ssh2_session_id, 20); q += 20; + memcpy(q, pktout.data+5, pktout.length-5); + q += pktout.length-5; + /* And finally the (zero) flags word. */ + PUT_32BIT(q, 0); + agent_query(agentreq, len+4, &ret, &retlen); + sfree(agentreq); + if (ret) { + if (ret[4] == SSH2_AGENT_SIGN_RESPONSE) { + logevent("Sending Pageant's response"); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(ret+9, GET_32BIT(ret+5)); + ssh2_pkt_send(); + authed = TRUE; + break; + } else { + logevent("Pageant failed to answer challenge"); + sfree(ret); + } + } + } + if (authed) + continue; + } + } + + if (!method && can_pubkey && *cfg.keyfile && !tried_pubkey_config) { + unsigned char *pub_blob; + char *algorithm, *comment; + int pub_blob_len; + + tried_pubkey_config = TRUE; + + /* + * Try the public key supplied in the configuration. + * + * First, offer the public blob to see if the server is + * willing to accept it. + */ + pub_blob = ssh2_userkey_loadpub(cfg.keyfile, &algorithm, + &pub_blob_len); + if (pub_blob) { + ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); + ssh2_pkt_addstring(username); + ssh2_pkt_addstring("ssh-connection"); /* service requested */ + ssh2_pkt_addstring("publickey");/* method */ + ssh2_pkt_addbool(FALSE); /* no signature included */ + ssh2_pkt_addstring(algorithm); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(pub_blob, pub_blob_len); + ssh2_pkt_send(); + logevent("Offered public key"); /* FIXME */ + + crWaitUntilV(ispkt); + if (pktin.type != SSH2_MSG_USERAUTH_PK_OK) { + gotit = TRUE; + type = AUTH_TYPE_PUBLICKEY_OFFER_LOUD; + continue; /* key refused; give up on it */ + } + + logevent("Offer of public key accepted"); + /* + * Actually attempt a serious authentication using + * the key. + */ + if (ssh2_userkey_encrypted(cfg.keyfile, &comment)) { + sprintf(pwprompt, "Passphrase for key \"%.100s\": ", comment); + need_pw = TRUE; + } else { + need_pw = FALSE; + } + c_write_str("Authenticating with public key \""); + c_write_str(comment); + c_write_str("\"\r\n"); + method = AUTH_PUBLICKEY_FILE; + } + } + + if (!method && can_passwd) { + method = AUTH_PASSWORD; + sprintf(pwprompt, "%.90s@%.90s's password: ", username, savedhost); + need_pw = TRUE; + } + + if (need_pw) { + if (ssh_get_password) { + if (!ssh_get_password(pwprompt, password, sizeof(password))) { + /* + * get_password failed to get a password (for + * example because one was supplied on the command + * line which has already failed to work). + * Terminate. + */ + logevent("No more passwords to try"); + ssh_state = SSH_STATE_CLOSED; + crReturnV; + } + } else { + static int pos = 0; + static char c; + + c_write_str(pwprompt); + ssh_send_ok = 1; + + pos = 0; + while (pos >= 0) { + crWaitUntilV(!ispkt); + while (inlen--) switch (c = *in++) { + case 10: case 13: + password[pos] = 0; + pos = -1; + break; + case 8: case 127: + if (pos > 0) + pos--; + break; + case 21: case 27: + pos = 0; + break; + case 3: case 4: + random_save_seed(); + exit(0); + break; + default: + if (((c >= ' ' && c <= '~') || + ((unsigned char)c >= 160)) && pos < 40) + password[pos++] = c; + break; + } + } + c_write_str("\r\n"); + } + } + + if (method == AUTH_PUBLICKEY_FILE) { + /* + * We have our passphrase. Now try the actual authentication. + */ + struct ssh2_userkey *key; + + key = ssh2_load_userkey(cfg.keyfile, password); + if (key == SSH2_WRONG_PASSPHRASE || key == NULL) { + if (key == SSH2_WRONG_PASSPHRASE) { + c_write_str("Wrong passphrase\r\n"); + tried_pubkey_config = FALSE; + } else { + c_write_str("Unable to load private key\r\n"); + tried_pubkey_config = TRUE; + } + /* Send a spurious AUTH_NONE to return to the top. */ + ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); + ssh2_pkt_addstring(username); + ssh2_pkt_addstring("ssh-connection"); /* service requested */ + ssh2_pkt_addstring("none"); /* method */ + ssh2_pkt_send(); + type = AUTH_TYPE_NONE; + } else { + unsigned char *blob, *sigdata; + int blob_len, sigdata_len; + + /* + * We have loaded the private key and the server + * has announced that it's willing to accept it. + * Hallelujah. Generate a signature and send it. + */ + ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); + ssh2_pkt_addstring(username); + ssh2_pkt_addstring("ssh-connection"); /* service requested */ + ssh2_pkt_addstring("publickey"); /* method */ + ssh2_pkt_addbool(TRUE); + ssh2_pkt_addstring(key->alg->name); + blob = key->alg->public_blob(key->data, &blob_len); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(blob, blob_len); + sfree(blob); + + /* + * The data to be signed is: + * + * string session-id + * + * followed by everything so far placed in the + * outgoing packet. + */ + sigdata_len = pktout.length - 5 + 4 + 20; + sigdata = smalloc(sigdata_len); + PUT_32BIT(sigdata, 20); + memcpy(sigdata+4, ssh2_session_id, 20); + memcpy(sigdata+24, pktout.data+5, pktout.length-5); + blob = key->alg->sign(key->data, sigdata, sigdata_len, &blob_len); + ssh2_pkt_addstring_start(); + ssh2_pkt_addstring_data(blob, blob_len); + sfree(blob); + sfree(sigdata); + + ssh2_pkt_send(); + type = AUTH_TYPE_PUBLICKEY; + } + } else if (method == AUTH_PASSWORD) { + /* + * We send the password packet lumped tightly together with + * an SSH_MSG_IGNORE packet. The IGNORE packet contains a + * string long enough to make the total length of the two + * packets constant. This should ensure that a passive + * listener doing traffic analyis can't work out the length + * of the password. + * + * For this to work, we need an assumption about the + * maximum length of the password packet. I think 256 is + * pretty conservative. Anyone using a password longer than + * that probably doesn't have much to worry about from + * people who find out how long their password is! + */ + ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST); + ssh2_pkt_addstring(username); + ssh2_pkt_addstring("ssh-connection"); /* service requested */ + ssh2_pkt_addstring("password"); + ssh2_pkt_addbool(FALSE); + ssh2_pkt_addstring(password); + ssh2_pkt_defer(); + /* + * We'll include a string that's an exact multiple of the + * cipher block size. If the cipher is NULL for some + * reason, we don't do this trick at all because we gain + * nothing by it. + */ + if (cscipher) { + int i, j; + ssh2_pkt_init(SSH2_MSG_IGNORE); + ssh2_pkt_addstring_start(); + for (i = deferred_len; i <= 256; i += cscipher->blksize) { + for (j = 0; j < cscipher->blksize; j++) { + char c = (char)random_byte(); + ssh2_pkt_addstring_data(&c, 1); + } + } + ssh2_pkt_defer(); + } + ssh2_pkt_defersend(); + logevent("Sent password\r\n"); + type = AUTH_TYPE_PASSWORD; + } else { + c_write_str("No supported authentication methods left to try!\r\n"); + logevent("No supported authentications offered. Disconnecting"); + ssh2_pkt_init(SSH2_MSG_DISCONNECT); + ssh2_pkt_adduint32(SSH2_DISCONNECT_BY_APPLICATION); + ssh2_pkt_addstring("No supported authentication methods available"); + ssh2_pkt_addstring("en"); /* language tag */ + ssh2_pkt_send(); + ssh_state = SSH_STATE_CLOSED; + crReturnV; + } + } + } while (!we_are_in); /* * Now we're authenticated for the connection protocol. The @@ -2265,12 +3177,12 @@ 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 = smalloc(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(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); @@ -2284,13 +3196,58 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) crReturnV; } 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; + mainchan->type = CHAN_MAINSESSION; + mainchan->closes = 0; + mainchan->v2.remwindow = ssh2_pkt_getuint32(); + mainchan->v2.remmaxpkt = ssh2_pkt_getuint32(); + mainchan->v2.outbuffer = NULL; + mainchan->v2.outbuflen = mainchan->v2.outbufsize = 0; + ssh_channels = newtree234(ssh_channelcmp); + add234(ssh_channels, mainchan); logevent("Opened channel for session"); /* + * Potentially enable X11 forwarding. + */ + if (cfg.x11_forward) { + char proto[20], data[64]; + logevent("Requesting X11 forwarding"); + x11_invent_auth(proto, sizeof(proto), data, sizeof(data)); + ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST); + ssh2_pkt_adduint32(mainchan->remoteid); + ssh2_pkt_addstring("x11-req"); + ssh2_pkt_addbool(1); /* want reply */ + ssh2_pkt_addbool(0); /* many connections */ + ssh2_pkt_addstring(proto); + ssh2_pkt_addstring(data); + ssh2_pkt_adduint32(0); /* screen number */ + ssh2_pkt_send(); + + do { + crWaitUntilV(ispkt); + if (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST) { + unsigned i = ssh2_pkt_getuint32(); + struct ssh_channel *c; + c = find234(ssh_channels, &i, ssh_channelfind); + if (!c) + continue; /* nonexistent channel */ + c->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) { + bombout(("Server got confused by X11 forwarding request")); + crReturnV; + } + logevent("X11 forwarding refused"); + } else { + logevent("X11 forwarding enabled"); + ssh_X11_fwd_enabled = TRUE; + } + } + + /* * Now allocate a pty for the session. */ if (!cfg.nopty) { @@ -2306,14 +3263,17 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) ssh2_pkt_addstring_start(); ssh2_pkt_addstring_data("\0", 1);/* TTY_OP_END, no special options */ ssh2_pkt_send(); + ssh_state = SSH_STATE_INTERMED; 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(); + unsigned i = ssh2_pkt_getuint32(); + struct ssh_channel *c; + c = find234(ssh_channels, &i, ssh_channelfind); + if (!c) + continue; /* nonexistent channel */ + c->v2.remwindow += ssh2_pkt_getuint32(); } } while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST); @@ -2322,10 +3282,13 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) bombout(("Server got confused by pty request")); crReturnV; } - c_write("Server refused to allocate pty\r\n", 32); + c_write_str("Server refused to allocate pty\r\n"); + ssh_editing = ssh_echoing = 1; } else { logevent("Allocated pty"); } + } else { + ssh_editing = ssh_echoing = 1; } /* @@ -2333,7 +3296,11 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) */ ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST); ssh2_pkt_adduint32(mainchan->remoteid); /* recipient channel */ - if (*cfg.remote_cmd) { + if (cfg.ssh_subsys) { + ssh2_pkt_addstring("subsystem"); + ssh2_pkt_addbool(1); /* want reply */ + ssh2_pkt_addstring(cfg.remote_cmd); + } else if (*cfg.remote_cmd) { ssh2_pkt_addstring("exec"); ssh2_pkt_addbool(1); /* want reply */ ssh2_pkt_addstring(cfg.remote_cmd); @@ -2345,10 +3312,12 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) 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(); + unsigned i = ssh2_pkt_getuint32(); + struct ssh_channel *c; + c = find234(ssh_channels, &i, ssh_channelfind); + if (!c) + continue; /* nonexistent channel */ + c->v2.remwindow += ssh2_pkt_getuint32(); } } while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST); if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) { @@ -2362,11 +3331,17 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) logevent("Started a shell/command"); } + ssh_state = SSH_STATE_SESSION; + if (size_needed) + ssh_size(); + if (eof_needed) + ssh_special(TS_EOF); + /* * Transfer data! */ + ldisc_send(NULL, 0); /* cause ldisc to notice changes */ ssh_send_ok = 1; - begin_session(); while (1) { static int try_send; crReturnV; @@ -2376,52 +3351,158 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) pktin.type == SSH2_MSG_CHANNEL_EXTENDED_DATA) { char *data; int length; - /* FIXME: be able to handle other channels here */ - if (ssh2_pkt_getuint32() != mainchan->localid) - continue; /* wrong channel */ + unsigned i = ssh2_pkt_getuint32(); + struct ssh_channel *c; + c = find234(ssh_channels, &i, ssh_channelfind); + if (!c) + continue; /* nonexistent 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_writedata(data, length); + switch (c->type) { + case CHAN_MAINSESSION: + from_backend(pktin.type == SSH2_MSG_CHANNEL_EXTENDED_DATA, + data, length); + break; + case CHAN_X11: + x11_send(c->u.x11.s, data, length); + break; + } /* - * Enlarge the window again at the remote side, - * just in case it ever runs down and they fail - * to send us any more data. + * 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(c->remoteid); ssh2_pkt_adduint32(length); ssh2_pkt_send(); } } else if (pktin.type == SSH2_MSG_DISCONNECT) { ssh_state = SSH_STATE_CLOSED; logevent("Received disconnect message"); + crReturnV; } 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 */ + unsigned i = ssh2_pkt_getuint32(); + struct ssh_channel *c; + + c = find234(ssh_channels, &i, ssh_channelfind); + if (!c) + continue; /* nonexistent channel */ + + if (c->type == CHAN_X11) { + /* + * Remote EOF on an X11 channel means we should + * wrap up and close the channel ourselves. + */ + x11_close(c->u.x11.s); + sshfwd_close(c); + } } 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" */) { + unsigned i = ssh2_pkt_getuint32(); + struct ssh_channel *c; + enum234 e; + + c = find234(ssh_channels, &i, ssh_channelfind); + if (!c) + continue; /* nonexistent channel */ + if (c->closes == 0) { + ssh2_pkt_init(SSH2_MSG_CHANNEL_CLOSE); + ssh2_pkt_adduint32(c->remoteid); + ssh2_pkt_send(); + } + /* Do pre-close processing on the channel. */ + switch (c->type) { + case CHAN_MAINSESSION: + break; /* nothing to see here, move along */ + case CHAN_X11: + break; + } + del234(ssh_channels, c); + sfree(c->v2.outbuffer); + sfree(c); + + /* + * See if that was the last channel left open. + */ + c = first234(ssh_channels, &e); + if (!c) { logevent("All channels closed. Disconnecting"); ssh2_pkt_init(SSH2_MSG_DISCONNECT); + ssh2_pkt_adduint32(SSH2_DISCONNECT_BY_APPLICATION); + ssh2_pkt_addstring("All open channels closed"); + ssh2_pkt_addstring("en"); /* language tag */ ssh2_pkt_send(); + ssh_state = SSH_STATE_CLOSED; + crReturnV; } continue; /* remote sends close; ignore (FIXME) */ } else 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(); + unsigned i = ssh2_pkt_getuint32(); + struct ssh_channel *c; + c = find234(ssh_channels, &i, ssh_channelfind); + if (!c) + continue; /* nonexistent channel */ + mainchan->v2.remwindow += ssh2_pkt_getuint32(); try_send = TRUE; + } else if (pktin.type == SSH2_MSG_CHANNEL_OPEN) { + char *type; + int typelen; + char *error = NULL; + struct ssh_channel *c; + ssh2_pkt_getstring(&type, &typelen); + c = smalloc(sizeof(struct ssh_channel)); + + if (typelen == 3 && !memcmp(type, "x11", 3)) { + if (!ssh_X11_fwd_enabled) + error = "X11 forwarding is not enabled"; + else if ( x11_init(&c->u.x11.s, cfg.x11_display, c) != NULL ) { + error = "Unable to open an X11 connection"; + } else { + c->type = CHAN_X11; + } + } else { + error = "Unsupported channel type requested"; + } + + c->remoteid = ssh2_pkt_getuint32(); + if (error) { + ssh2_pkt_init(SSH2_MSG_CHANNEL_OPEN_FAILURE); + ssh2_pkt_adduint32(c->remoteid); + ssh2_pkt_adduint32(SSH2_OPEN_CONNECT_FAILED); + ssh2_pkt_addstring(error); + ssh2_pkt_addstring("en"); /* language tag */ + ssh2_pkt_send(); + sfree(c); + } else { + struct ssh_channel *d; + unsigned i; + enum234 e; + + for (i=1, d = first234(ssh_channels, &e); d; + d = next234(&e)) { + if (d->localid > i) + break; /* found a free number */ + i = d->localid + 1; + } + c->localid = i; + c->closes = 0; + c->v2.remwindow = ssh2_pkt_getuint32(); + c->v2.remmaxpkt = ssh2_pkt_getuint32(); + c->v2.outbuffer = NULL; + c->v2.outbuflen = c->v2.outbufsize = 0; + add234(ssh_channels, c); + ssh2_pkt_init(SSH2_MSG_CHANNEL_OPEN_CONFIRMATION); + ssh2_pkt_adduint32(c->remoteid); + ssh2_pkt_adduint32(c->localid); + ssh2_pkt_adduint32(0x8000UL); /* our window size */ + ssh2_pkt_adduint32(0x4000UL); /* our max pkt size */ + ssh2_pkt_send(); + } } else { bombout(("Strange packet received: type %d", pktin.type)); crReturnV; @@ -2430,40 +3511,17 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) /* * 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; + ssh2_add_channel_data(mainchan, in, inlen); try_send = TRUE; } if (try_send) { + enum234 e; + struct ssh_channel *c; /* - * Try to send data on the channel if we can. (FIXME: - * on _all_ channels.) + * Try to send data on all channels if we can. */ - 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; - } + for (c = first234(ssh_channels, &e); c; c = next234(&e)) + ssh2_try_send(c); } } @@ -2481,13 +3539,11 @@ static void ssh2_protocol(unsigned char *in, int inlen, int ispkt) } /* - * Called to set up the connection. Will arrange for WM_NETEVENT - * messages to be passed to the specified window, whose window - * procedure should then call telnet_msg(). + * Called to set up the connection. * * Returns an error message, or NULL on success. */ -static char *ssh_init (HWND hwnd, char *host, int port, char **realhost) { +static char *ssh_init (char *host, int port, char **realhost) { char *p; #ifdef MSCRYPTOAPI @@ -2495,88 +3551,34 @@ static char *ssh_init (HWND hwnd, char *host, int port, char **realhost) { return "Microsoft high encryption pack not installed!"; #endif + ssh_send_ok = 0; + ssh_editing = 0; + ssh_echoing = 0; + p = connect_to_host(host, port, realhost); if (p != NULL) return p; - if (!do_ssh_init()) - return "Protocol initialisation error"; - - if (hwnd && WSAAsyncSelect (s, hwnd, WM_NETEVENT, FD_READ | FD_CLOSE) == SOCKET_ERROR) - switch (WSAGetLastError()) { - case WSAENETDOWN: return "Network is down"; - default: return "WSAAsyncSelect(): unknown error"; - } - return NULL; } /* - * Process a WM_NETEVENT message. Will return 0 if the connection - * has closed, or <0 for a socket error. - */ -static int ssh_msg (WPARAM wParam, LPARAM lParam) { - int ret; - char buf[256]; - - /* - * Because reading less than the whole of the available pending - * data can generate an FD_READ event, we need to allow for the - * possibility that FD_READ may arrive with FD_CLOSE already in - * the queue; so it's possible that we can get here even with s - * invalid. If so, we return 1 and don't worry about it. - */ - if (s == INVALID_SOCKET) - return 1; - - if (WSAGETSELECTERROR(lParam) != 0) { - closesocket(s); - s = INVALID_SOCKET; - return -WSAGETSELECTERROR(lParam); - } - - switch (WSAGETSELECTEVENT(lParam)) { - case FD_READ: - case FD_CLOSE: - ret = recv(s, buf, sizeof(buf), 0); - if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK) - return 1; - if (ret < 0) { /* any _other_ error */ - closesocket(s); - s = INVALID_SOCKET; - return -10000-WSAGetLastError(); - } - if (ret == 0) { - s = INVALID_SOCKET; - return 0; - } - ssh_gotdata (buf, ret); - if (ssh_state == SSH_STATE_CLOSED) { - closesocket(s); - s = INVALID_SOCKET; - return 0; - } - return 1; - } - return 1; /* shouldn't happen, but WTF */ -} - -/* * Called to send data down the Telnet connection. */ static void ssh_send (char *buf, int len) { - if (s == INVALID_SOCKET) + if (s == NULL || ssh_protocol == NULL) return; ssh_protocol(buf, len, 0); } /* - * Called to set the size of the window from Telnet's POV. + * Called to set the size of the window from SSH's POV. */ static void ssh_size(void) { switch (ssh_state) { case SSH_STATE_BEFORE_SIZE: + case SSH_STATE_PREPACKET: case SSH_STATE_CLOSED: break; /* do nothing */ case SSH_STATE_INTERMED: @@ -2584,10 +3586,23 @@ static void ssh_size(void) { break; case SSH_STATE_SESSION: if (!cfg.nopty) { - send_packet(SSH1_CMSG_WINDOW_SIZE, - PKT_INT, rows, PKT_INT, cols, - PKT_INT, 0, PKT_INT, 0, PKT_END); + if (ssh_version == 1) { + send_packet(SSH1_CMSG_WINDOW_SIZE, + PKT_INT, rows, PKT_INT, cols, + PKT_INT, 0, PKT_INT, 0, PKT_END); + } else { + ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST); + ssh2_pkt_adduint32(mainchan->remoteid); + ssh2_pkt_addstring("window-change"); + ssh2_pkt_addbool(0); + ssh2_pkt_adduint32(cols); + ssh2_pkt_adduint32(rows); + ssh2_pkt_adduint32(0); + ssh2_pkt_adduint32(0); + ssh2_pkt_send(); + } } + break; } } @@ -2598,6 +3613,15 @@ static void ssh_size(void) { */ static void ssh_special (Telnet_Special code) { if (code == TS_EOF) { + if (ssh_state != SSH_STATE_SESSION) { + /* + * Buffer the EOF in case we are pre-SESSION, so we can + * send it as soon as we reach SESSION. + */ + if (code == TS_EOF) + eof_needed = TRUE; + return; + } if (ssh_version == 1) { send_packet(SSH1_CMSG_EOF, PKT_END); } else { @@ -2606,21 +3630,38 @@ static void ssh_special (Telnet_Special code) { ssh2_pkt_send(); } logevent("Sent EOF message"); + } else if (code == TS_PING) { + if (ssh_state == SSH_STATE_CLOSED || ssh_state == SSH_STATE_PREPACKET) + return; + 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 { /* do nothing */ } } -static SOCKET ssh_socket(void) { return s; } +static Socket ssh_socket(void) { return s; } static int ssh_sendok(void) { return ssh_send_ok; } +static int ssh_ldisc(int option) { + if (option == LD_ECHO) return ssh_echoing; + if (option == LD_EDIT) return ssh_editing; + return FALSE; +} + Backend ssh_backend = { ssh_init, - ssh_msg, ssh_send, ssh_size, ssh_special, ssh_socket, - ssh_sendok + ssh_sendok, + ssh_ldisc, + 22 };