X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/c4fa2fceb6e388c55079e41628d375b1c86bff8b..97db3be4f673508e214040881556d35f3d65406a:/ssh.c diff --git a/ssh.c b/ssh.c index 852a2dad..26cfbaa4 100644 --- a/ssh.c +++ b/ssh.c @@ -13,7 +13,6 @@ #include "putty.h" #include "tree234.h" #include "ssh.h" -#include "scp.h" #ifndef FALSE #define FALSE 0 @@ -148,63 +147,40 @@ enum { PKT_END, PKT_INT, PKT_CHAR, PKT_DATA, PKT_STR, PKT_BIGNUM }; #define crWaitUntil(c) do { crReturn(0); } while (!(c)) #define crWaitUntilV(c) do { crReturnV; } while (!(c)) -extern struct ssh_cipher ssh_3des; -extern struct ssh_cipher ssh_3des_ssh2; -extern struct ssh_cipher ssh_des; -extern struct ssh_cipher ssh_blowfish_ssh1; -extern struct ssh_cipher ssh_blowfish_ssh2; +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; /* * Ciphers for SSH2. We miss out single-DES because it isn't * supported; also 3DES and Blowfish are both done differently from * SSH1. (3DES uses outer chaining; Blowfish has the opposite * endianness and different-sized keys.) - * - * The first entry in this array is set up to be whatever the user - * asks for as a cipher. Thereafter there is a fixed preference - * order of fallback ciphers. */ -struct ssh_cipher *ciphers[] = { NULL, &ssh_blowfish_ssh2, &ssh_3des_ssh2 }; - -extern struct ssh_kex ssh_diffiehellman; -struct ssh_kex *kex_algs[] = { &ssh_diffiehellman }; +const static struct ssh_cipher *ciphers[] = { &ssh_blowfish_ssh2, &ssh_3des_ssh2 }; -extern struct ssh_hostkey ssh_dss; -struct ssh_hostkey *hostkey_algs[] = { &ssh_dss }; +extern const struct ssh_kex ssh_diffiehellman; +const static struct ssh_kex *kex_algs[] = { &ssh_diffiehellman }; -extern struct ssh_mac ssh_sha1; +extern const struct ssh_hostkey ssh_dss; +const static struct ssh_hostkey *hostkey_algs[] = { &ssh_dss }; -static SHA_State exhash; +extern const struct ssh_mac ssh_sha1; static void nullmac_key(unsigned char *key) { } static void nullmac_generate(unsigned char *blk, int len, unsigned long seq) { } static int nullmac_verify(unsigned char *blk, int len, unsigned long seq) { return 1; } -struct ssh_mac ssh_mac_none = { +const static struct ssh_mac ssh_mac_none = { nullmac_key, nullmac_key, nullmac_generate, nullmac_verify, "none", 0 }; -struct ssh_mac *macs[] = { &ssh_sha1, &ssh_mac_none }; +const static struct ssh_mac *macs[] = { &ssh_sha1, &ssh_mac_none }; -struct ssh_compress ssh_comp_none = { +const static struct ssh_compress ssh_comp_none = { "none" }; -struct ssh_compress *compressions[] = { &ssh_comp_none }; - -static SOCKET s = INVALID_SOCKET; - -static unsigned char session_key[32]; -static struct ssh_cipher *cipher = NULL; -static struct ssh_cipher *cscipher = NULL; -static struct ssh_cipher *sccipher = NULL; -static struct ssh_mac *csmac = NULL; -static struct ssh_mac *scmac = NULL; -static struct ssh_compress *cscomp = NULL; -static struct ssh_compress *sccomp = NULL; -static struct ssh_kex *kex = NULL; -static struct ssh_hostkey *hostkey = NULL; -int (*ssh_get_password)(const char *prompt, char *str, int maxlen) = NULL; - -static char *savedhost; -static int ssh_send_ok; +const static struct ssh_compress *compressions[] = { &ssh_comp_none }; /* * 2-3-4 tree storing channels. @@ -226,7 +202,74 @@ struct ssh_channel { } v2; } u; }; + +struct Packet { + long length; + int type; + unsigned char *data; + unsigned char *body; + long savedpos; + long maxlen; +}; + +static SHA_State exhash; + +static SOCKET s = INVALID_SOCKET; + +static unsigned char session_key[32]; +static const struct ssh_cipher *cipher = NULL; +static const struct ssh_cipher *cscipher = NULL; +static const struct ssh_cipher *sccipher = NULL; +static const struct ssh_mac *csmac = NULL; +static const struct ssh_mac *scmac = NULL; +static const struct ssh_compress *cscomp = NULL; +static const struct ssh_compress *sccomp = NULL; +static const struct ssh_kex *kex = NULL; +static const struct ssh_hostkey *hostkey = NULL; +int (*ssh_get_password)(const char *prompt, char *str, int maxlen) = NULL; + +static char *savedhost; +static int savedport; +static int ssh_send_ok; + static tree234 *ssh_channels; /* indexed by local id */ +static struct ssh_channel *mainchan; /* primary session channel */ + +static enum { + SSH_STATE_BEFORE_SIZE, + SSH_STATE_INTERMED, + SSH_STATE_SESSION, + SSH_STATE_CLOSED +} ssh_state = SSH_STATE_BEFORE_SIZE; + +static int size_needed = FALSE; + +static struct Packet pktin = { 0, 0, NULL, NULL, 0 }; +static struct Packet pktout = { 0, 0, NULL, NULL, 0 }; + +static int ssh_version; +static void (*ssh_protocol)(unsigned char *in, int inlen, int ispkt); +static void ssh1_protocol(unsigned char *in, int inlen, int ispkt); +static void ssh2_protocol(unsigned char *in, int inlen, int ispkt); +static void ssh_size(void); + +static int (*s_rdpkt)(unsigned char **data, int *datalen); + +static struct rdpkt1_state_tag { + long len, pad, biglen, to_read; + unsigned long realcrc, gotcrc; + unsigned char *p; + int i; + int chunk; +} rdpkt1_state; + +static struct rdpkt2_state_tag { + long len, pad, payload, packetlen, maclen; + int i; + int cipherblk; + unsigned long incoming_sequence; +} rdpkt2_state; + static int ssh_channelcmp(void *av, void *bv) { struct ssh_channel *a = (struct ssh_channel *)av; struct ssh_channel *b = (struct ssh_channel *)bv; @@ -242,17 +285,6 @@ static int ssh_channelfind(void *av, void *bv) { return 0; } -static struct ssh_channel *mainchan; /* primary session channel */ - -static enum { - SSH_STATE_BEFORE_SIZE, - SSH_STATE_INTERMED, - SSH_STATE_SESSION, - SSH_STATE_CLOSED -} ssh_state = SSH_STATE_BEFORE_SIZE; - -static int size_needed = FALSE; - static void s_write (char *buf, int len) { while (len > 0) { int i = send (s, buf, len, 0); @@ -291,25 +323,10 @@ static void c_write (char *buf, int len) { c_write1(*buf++); } -struct Packet { - long length; - int type; - unsigned char *data; - unsigned char *body; - long savedpos; - long maxlen; -}; - -static struct Packet pktin = { 0, 0, NULL, NULL, 0 }; -static struct Packet pktout = { 0, 0, NULL, NULL, 0 }; - -static int ssh_version; -static void (*ssh_protocol)(unsigned char *in, int inlen, int ispkt); -static void ssh1_protocol(unsigned char *in, int inlen, int ispkt); -static void ssh2_protocol(unsigned char *in, int inlen, int ispkt); -static void ssh_size(void); - -static int (*s_rdpkt)(unsigned char **data, int *datalen); +static void c_writedata (char *buf, int len) { + while (len--) + c_write1(*buf++); +} /* * Collect incoming data in the incoming packet buffer. @@ -321,10 +338,7 @@ static int (*s_rdpkt)(unsigned char **data, int *datalen); */ static int ssh1_rdpkt(unsigned char **data, int *datalen) { - static long len, pad, biglen, to_read; - static unsigned long realcrc, gotcrc; - static unsigned char *p; - static int i; + struct rdpkt1_state_tag *st = &rdpkt1_state; crBegin; @@ -333,56 +347,55 @@ next_packet: pktin.type = 0; pktin.length = 0; - for (i = len = 0; i < 4; i++) { + for (st->i = st->len = 0; st->i < 4; st->i++) { while ((*datalen) == 0) - crReturn(4-i); - len = (len << 8) + **data; + crReturn(4-st->i); + st->len = (st->len << 8) + **data; (*data)++, (*datalen)--; } #ifdef FWHACK - if (len == 0x52656d6f) { /* "Remo"te server has closed ... */ - len = 0x300; /* big enough to carry to end */ + if (st->len == 0x52656d6f) { /* "Remo"te server has closed ... */ + st->len = 0x300; /* big enough to carry to end */ } #endif - pad = 8 - (len % 8); - biglen = len + pad; - pktin.length = len - 5; + st->pad = 8 - (st->len % 8); + st->biglen = st->len + st->pad; + pktin.length = st->len - 5; - if (pktin.maxlen < biglen) { - pktin.maxlen = biglen; - pktin.data = (pktin.data == NULL ? malloc(biglen+APIEXTRA) : - realloc(pktin.data, biglen+APIEXTRA)); + if (pktin.maxlen < st->biglen) { + pktin.maxlen = st->biglen; + pktin.data = (pktin.data == NULL ? malloc(st->biglen+APIEXTRA) : + realloc(pktin.data, st->biglen+APIEXTRA)); if (!pktin.data) fatalbox("Out of memory"); } - to_read = biglen; - p = pktin.data; - while (to_read > 0) { - static int chunk; - chunk = to_read; + st->to_read = st->biglen; + st->p = pktin.data; + while (st->to_read > 0) { + st->chunk = st->to_read; while ((*datalen) == 0) - crReturn(to_read); - if (chunk > (*datalen)) - chunk = (*datalen); - memcpy(p, *data, chunk); - *data += chunk; - *datalen -= chunk; - p += chunk; - to_read -= chunk; + crReturn(st->to_read); + if (st->chunk > (*datalen)) + st->chunk = (*datalen); + memcpy(st->p, *data, st->chunk); + *data += st->chunk; + *datalen -= st->chunk; + st->p += st->chunk; + st->to_read -= st->chunk; } if (cipher) - cipher->decrypt(pktin.data, biglen); + cipher->decrypt(pktin.data, st->biglen); - pktin.type = pktin.data[pad]; - pktin.body = pktin.data + pad + 1; + pktin.type = pktin.data[st->pad]; + pktin.body = pktin.data + st->pad + 1; - realcrc = crc32(pktin.data, biglen-4); - gotcrc = GET_32BIT(pktin.data+biglen-4); - if (gotcrc != realcrc) { + st->realcrc = crc32(pktin.data, st->biglen-4); + st->gotcrc = GET_32BIT(pktin.data+st->biglen-4); + if (st->gotcrc != st->realcrc) { bombout(("Incorrect CRC received on packet")); crReturn(0); } @@ -419,29 +432,24 @@ next_packet: static int ssh2_rdpkt(unsigned char **data, int *datalen) { - static long len, pad, payload, packetlen, maclen; - static int i; - static int cipherblk; - static unsigned long incoming_sequence = 0; + struct rdpkt2_state_tag *st = &rdpkt2_state; crBegin; next_packet: - pktin.type = 0; pktin.length = 0; - - if (cipher) - cipherblk = cipher->blksize; + if (sccipher) + st->cipherblk = sccipher->blksize; else - cipherblk = 8; - if (cipherblk < 8) - cipherblk = 8; - - if (pktin.maxlen < cipherblk) { - pktin.maxlen = cipherblk; - pktin.data = (pktin.data == NULL ? malloc(cipherblk+APIEXTRA) : - realloc(pktin.data, cipherblk+APIEXTRA)); + st->cipherblk = 8; + if (st->cipherblk < 8) + st->cipherblk = 8; + + if (pktin.maxlen < st->cipherblk) { + pktin.maxlen = st->cipherblk; + pktin.data = (pktin.data == NULL ? malloc(st->cipherblk+APIEXTRA) : + realloc(pktin.data, st->cipherblk+APIEXTRA)); if (!pktin.data) fatalbox("Out of memory"); } @@ -450,10 +458,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 @@ -462,32 +470,32 @@ 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; + if (pktin.maxlen < st->packetlen+st->maclen) { + pktin.maxlen = st->packetlen+st->maclen; pktin.data = (pktin.data == NULL ? malloc(pktin.maxlen+APIEXTRA) : realloc(pktin.data, pktin.maxlen+APIEXTRA)); if (!pktin.data) @@ -497,31 +505,32 @@ next_packet: /* * Read and decrypt the remainder of the packet. */ - for (i = cipherblk; i < packetlen + maclen; i++) { + for (st->i = st->cipherblk; st->i < st->packetlen + st->maclen; st->i++) { while ((*datalen) == 0) - crReturn(packetlen + maclen - i); - pktin.data[i] = *(*data)++; + crReturn(st->packetlen + st->maclen - st->i); + pktin.data[st->i] = *(*data)++; (*datalen)--; } /* Decrypt everything _except_ the MAC. */ if (sccipher) - sccipher->decrypt(pktin.data + cipherblk, packetlen - cipherblk); + sccipher->decrypt(pktin.data + st->cipherblk, + st->packetlen - st->cipherblk); #if 0 - debug(("Got packet len=%d pad=%d\r\n", len, pad)); - for (i = 0; i < packetlen; i++) - debug((" %02x", (unsigned char)pktin.data[i])); + debug(("Got packet len=%d pad=%d\r\n", st->len, st->pad)); + for (st->i = 0; st->i < st->packetlen; st->i++) + debug((" %02x", (unsigned char)pktin.data[st->i])); debug(("\r\n")); #endif /* * Check the MAC. */ - if (scmac && !scmac->verify(pktin.data, len+4, incoming_sequence)) { + 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 */ pktin.savedpos = 6; pktin.type = pktin.data[5]; @@ -700,6 +709,7 @@ static char *connect_to_host(char *host, int port, char **realhost) if (port < 0) port = 22; /* default ssh port */ + savedport = port; #ifdef FWHACK FWhost = host; @@ -1021,6 +1031,8 @@ static int do_ssh_init(void) { break; } + rdpkt2_state.incoming_sequence = 0; + *vsp = 0; sprintf(vlog, "Server version: %s", vstring); vlog[strcspn(vlog, "\r\n")] = '\0'; @@ -1082,6 +1094,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) static int tried_publickey; static unsigned char session_id[16]; int cipher_type; + static char username[100]; crBegin; @@ -1100,21 +1113,15 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) j = makekey(pktin.body+8+i, &hostkey, &keystr2, 0); /* - * Hash the host key and print the hash in the log box. Just as - * a last resort in case the registry's host key checking is - * compromised, we'll allow the user some ability to verify - * host keys by eye. + * Log the host key fingerprint. */ - MD5Init(&md5c); - MD5Update(&md5c, keystr2, hostkey.bytes); - MD5Final(session_id, &md5c); { char logmsg[80]; - int i; - logevent("Host key MD5 is:"); + logevent("Host key fingerprint is:"); strcpy(logmsg, " "); - for (i = 0; i < 16; i++) - sprintf(logmsg+strlen(logmsg), "%02x", session_id[i]); + hostkey.comment = NULL; + rsa_fingerprint(logmsg+strlen(logmsg), sizeof(logmsg)-strlen(logmsg), + &hostkey); logevent(logmsg); } @@ -1144,11 +1151,13 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) * First format the key into a string. */ int len = rsastr_len(&hostkey); + char fingerprint[100]; char *keystr = malloc(len); if (!keystr) fatalbox("Out of memory"); rsastr_fmt(keystr, &hostkey); - verify_ssh_host_key(savedhost, keystr); + rsa_fingerprint(fingerprint, sizeof(fingerprint), &hostkey); + verify_ssh_host_key(savedhost, savedport, "rsa", keystr, fingerprint); free(keystr); } @@ -1209,7 +1218,6 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) fflush(stdout); { - static char username[100]; static int pos = 0; static char c; if ((flags & FLAG_INTERACTIVE) && !*cfg.username) { @@ -1437,7 +1445,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) } if (pwpkt_type == SSH1_CMSG_AUTH_PASSWORD) { sprintf(prompt, "%.90s@%.90s's password: ", - cfg.username, savedhost); + username, savedhost); } if (pwpkt_type == SSH1_CMSG_AUTH_RSA) { char *comment = NULL; @@ -1452,7 +1460,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) free(comment); } - if (!(flags & FLAG_INTERACTIVE)) { + if (ssh_get_password) { if (!ssh_get_password(prompt, password, sizeof(password))) { /* * get_password failed to get a password (for @@ -1651,7 +1659,7 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { if (pktin.type == SSH1_SMSG_STDOUT_DATA || pktin.type == SSH1_SMSG_STDERR_DATA) { long len = GET_32BIT(pktin.body); - c_write(pktin.body+4, len); + c_writedata(pktin.body+4, len); } else if (pktin.type == SSH1_MSG_DISCONNECT) { ssh_state = SSH_STATE_CLOSED; logevent("Received disconnect request"); @@ -1671,6 +1679,7 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { 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, @@ -1819,16 +1828,17 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) static int i, len; static char *str; static Bignum e, f, K; - static struct ssh_cipher *cscipher_tobe = NULL; - static struct ssh_cipher *sccipher_tobe = NULL; - static struct ssh_mac *csmac_tobe = NULL; - static struct ssh_mac *scmac_tobe = NULL; - static struct ssh_compress *cscomp_tobe = NULL; - static struct ssh_compress *sccomp_tobe = NULL; - static char *hostkeydata, *sigdata, *keystr; + static const struct ssh_cipher *cscipher_tobe = NULL; + static const struct ssh_cipher *sccipher_tobe = NULL; + static const struct ssh_mac *csmac_tobe = NULL; + static const struct ssh_mac *scmac_tobe = NULL; + static const struct ssh_compress *cscomp_tobe = NULL; + static const struct ssh_compress *sccomp_tobe = NULL; + static char *hostkeydata, *sigdata, *keystr, *fingerprint; static int hostkeylen, siglen; static unsigned char exchange_hash[20]; static unsigned char keyspace[40]; + static const struct ssh_cipher *preferred_cipher; crBegin; random_init(); @@ -1837,15 +1847,15 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) * Set up the preferred cipher. */ if (cfg.cipher == CIPHER_BLOWFISH) { - ciphers[0] = &ssh_blowfish_ssh2; + preferred_cipher = &ssh_blowfish_ssh2; } else if (cfg.cipher == CIPHER_DES) { logevent("Single DES not supported in SSH2; using 3DES"); - ciphers[0] = &ssh_3des_ssh2; + preferred_cipher = &ssh_3des_ssh2; } else if (cfg.cipher == CIPHER_3DES) { - ciphers[0] = &ssh_3des_ssh2; + preferred_cipher = &ssh_3des_ssh2; } else { /* Shouldn't happen, but we do want to initialise to _something_. */ - ciphers[0] = &ssh_3des_ssh2; + preferred_cipher = &ssh_3des_ssh2; } begin_key_exchange: @@ -1871,16 +1881,18 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) } /* List client->server encryption algorithms. */ ssh2_pkt_addstring_start(); - for (i = 0; i < lenof(ciphers); i++) { - ssh2_pkt_addstring_str(ciphers[i]->name); - if (i < lenof(ciphers)-1) + for (i = 0; i < lenof(ciphers)+1; i++) { + const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1]; + ssh2_pkt_addstring_str(c->name); + if (i < lenof(ciphers)) ssh2_pkt_addstring_str(","); } /* List server->client encryption algorithms. */ ssh2_pkt_addstring_start(); - for (i = 0; i < lenof(ciphers); i++) { - ssh2_pkt_addstring_str(ciphers[i]->name); - if (i < lenof(ciphers)-1) + for (i = 0; i < lenof(ciphers)+1; i++) { + const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1]; + ssh2_pkt_addstring_str(c->name); + if (i < lenof(ciphers)) ssh2_pkt_addstring_str(","); } /* List client->server MAC algorithms. */ @@ -1951,16 +1963,18 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) } } ssh2_pkt_getstring(&str, &len); /* client->server cipher */ - for (i = 0; i < lenof(ciphers); i++) { - if (in_commasep_string(ciphers[i]->name, str, len)) { - cscipher_tobe = ciphers[i]; + for (i = 0; i < lenof(ciphers)+1; i++) { + const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1]; + if (in_commasep_string(c->name, str, len)) { + cscipher_tobe = c; break; } } ssh2_pkt_getstring(&str, &len); /* server->client cipher */ - for (i = 0; i < lenof(ciphers); i++) { - if (in_commasep_string(ciphers[i]->name, str, len)) { - sccipher_tobe = ciphers[i]; + for (i = 0; i < lenof(ciphers)+1; i++) { + const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1]; + if (in_commasep_string(c->name, str, len)) { + sccipher_tobe = c; break; } } @@ -2054,7 +2068,12 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt) * checked the signature of the exchange hash.) */ keystr = hostkey->fmtkey(); - verify_ssh_host_key(savedhost, keystr); + fingerprint = hostkey->fingerprint(); + verify_ssh_host_key(savedhost, savedport, hostkey->keytype, + keystr, fingerprint); + logevent("Host key fingerprint is:"); + logevent(fingerprint); + free(fingerprint); free(keystr); /* @@ -2179,9 +2198,9 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) } } - if (!(flags & FLAG_INTERACTIVE)) { + if (ssh_get_password) { char prompt[200]; - sprintf(prompt, "%s@%s's password: ", cfg.username, savedhost); + sprintf(prompt, "%.90s@%.90s's password: ", username, savedhost); if (!ssh_get_password(prompt, password, sizeof(password))) { /* * get_password failed to get a password (for @@ -2370,7 +2389,7 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) continue; /* extended but not stderr */ ssh2_pkt_getstring(&data, &length); if (data) { - c_write(data, length); + c_writedata(data, length); /* * Enlarge the window again at the remote side, * just in case it ever runs down and they fail @@ -2597,171 +2616,6 @@ static void ssh_special (Telnet_Special code) { } } - -/* - * Read and decrypt one incoming SSH packet. - * (only used by pSCP) - */ -static void get_packet(void) -{ - unsigned char buf[4096], *p; - long to_read; - int len; - - p = NULL; - len = 0; - - while ((to_read = s_rdpkt(&p, &len)) > 0) { - if (to_read > sizeof(buf)) to_read = sizeof(buf); - len = s_read(buf, to_read); - if (len != to_read) { - closesocket(s); - s = INVALID_SOCKET; - return; - } - p = buf; - } - - assert(len == 0); -} - -/* - * Receive a block of data over the SSH link. Block until - * all data is available. Return nr of bytes read (0 if lost connection). - * (only used by pSCP) - */ -int ssh_scp_recv(unsigned char *buf, int len) -{ - static int pending_input_len = 0; - static unsigned char *pending_input_ptr; - int to_read = len; - - if (pending_input_len >= to_read) { - memcpy(buf, pending_input_ptr, to_read); - pending_input_ptr += to_read; - pending_input_len -= to_read; - return len; - } - - if (pending_input_len > 0) { - memcpy(buf, pending_input_ptr, pending_input_len); - buf += pending_input_len; - to_read -= pending_input_len; - pending_input_len = 0; - } - - if (s == INVALID_SOCKET) - return 0; - while (to_read > 0) { - get_packet(); - if (s == INVALID_SOCKET) - return 0; - if (pktin.type == SSH1_SMSG_STDOUT_DATA) { - int plen = GET_32BIT(pktin.body); - if (plen <= to_read) { - memcpy(buf, pktin.body + 4, plen); - buf += plen; - to_read -= plen; - } else { - memcpy(buf, pktin.body + 4, to_read); - pending_input_len = plen - to_read; - pending_input_ptr = pktin.body + 4 + to_read; - to_read = 0; - } - } else if (pktin.type == SSH1_SMSG_STDERR_DATA) { - int plen = GET_32BIT(pktin.body); - fwrite(pktin.body + 4, plen, 1, stderr); - } else if (pktin.type == SSH1_MSG_DISCONNECT) { - logevent("Received disconnect request"); - } else if (pktin.type == SSH1_SMSG_SUCCESS || - pktin.type == SSH1_SMSG_FAILURE) { - /* ignore */ - } else if (pktin.type == SSH1_SMSG_EXIT_STATUS) { - char logbuf[100]; - sprintf(logbuf, "Remote exit status: %d", GET_32BIT(pktin.body)); - logevent(logbuf); - send_packet(SSH1_CMSG_EXIT_CONFIRMATION, PKT_END); - logevent("Closing connection"); - closesocket(s); - s = INVALID_SOCKET; - } else { - bombout(("Strange packet received: type %d", pktin.type)); - return 0; - } - } - - return len; -} - -/* - * Send a block of data over the SSH link. - * Block until all data is sent. - * (only used by pSCP) - */ -void ssh_scp_send(unsigned char *buf, int len) -{ - if (s == INVALID_SOCKET) - return; - send_packet(SSH1_CMSG_STDIN_DATA, - PKT_INT, len, PKT_DATA, buf, len, PKT_END); -} - -/* - * Send an EOF notification to the server. - * (only used by pSCP) - */ -void ssh_scp_send_eof(void) -{ - if (s == INVALID_SOCKET) - return; - send_packet(SSH1_CMSG_EOF, PKT_END); -} - -/* - * Set up the connection, login on the remote host and - * start execution of a command. - * Returns an error message, or NULL on success. - * (only used by pSCP) - */ -char *ssh_scp_init(char *host, int port, char *cmd, char **realhost) -{ - char buf[160], *p; - -#ifdef MSCRYPTOAPI - if (crypto_startup() == 0) - return "Microsoft high encryption pack not installed!"; -#endif - - p = connect_to_host(host, port, realhost); - if (p != NULL) - return p; - - random_init(); - - if (!do_ssh_init()) - return "Protocol initialisation error"; - - /* Exchange keys and login */ - do { - get_packet(); - if (s == INVALID_SOCKET) - return "Connection closed by remote host"; - } while (!do_ssh1_login(NULL, 0, 1)); - - if (ssh_state == SSH_STATE_CLOSED) { - closesocket(s); - s = INVALID_SOCKET; - return "Session initialisation error"; - } - - /* Execute command */ - sprintf(buf, "Sending command: %.100s", cmd); - logevent(buf); - send_packet(SSH1_CMSG_EXEC_CMD, PKT_STR, cmd, PKT_END); - - return NULL; -} - static SOCKET ssh_socket(void) { return s; } static int ssh_sendok(void) { return ssh_send_ok; } @@ -2773,5 +2627,6 @@ Backend ssh_backend = { ssh_size, ssh_special, ssh_socket, - ssh_sendok + ssh_sendok, + 22 };