~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up handling of the return value from sftp_find_request. In many
[sgt/putty]
/
ssh.c
diff --git
a/ssh.c
b/ssh.c
index
1cbb471
..
bbe81b6
100644
(file)
--- a/
ssh.c
+++ b/
ssh.c
@@
-525,7
+525,7
@@
static void ssh_channel_destroy(struct ssh_channel *c);
const static struct ssh_signkey *hostkey_algs[] = { &ssh_rsa, &ssh_dss };
const static struct ssh_mac *macs[] = {
const static struct ssh_signkey *hostkey_algs[] = { &ssh_rsa, &ssh_dss };
const static struct ssh_mac *macs[] = {
- &ssh_hmac_sha1, &ssh_hmac_sha1_96, &ssh_hmac_md5
+ &ssh_hmac_sha
256, &ssh_hmac_sha
1, &ssh_hmac_sha1_96, &ssh_hmac_md5
};
const static struct ssh_mac *buggymacs[] = {
&ssh_hmac_sha1_buggy, &ssh_hmac_sha1_96_buggy, &ssh_hmac_md5
};
const static struct ssh_mac *buggymacs[] = {
&ssh_hmac_sha1_buggy, &ssh_hmac_sha1_96_buggy, &ssh_hmac_md5
@@
-4618,9
+4618,9
@@
static void ssh_setup_portfwd(Ssh ssh, Conf *conf)
/* XXX: rport_acceptall may not represent
* what was used to open the original connection,
* since it's reconfigurable. */
/* XXX: rport_acceptall may not represent
* what was used to open the original connection,
* since it's reconfigurable. */
- ssh2_pkt_addstring(pktout, "
0.0.0.0
");
+ ssh2_pkt_addstring(pktout, "");
} else {
} else {
- ssh2_pkt_addstring(pktout, "
127.0.0.1
");
+ ssh2_pkt_addstring(pktout, "
localhost
");
}
ssh2_pkt_adduint32(pktout, epf->sport);
ssh2_pkt_send(ssh, pktout);
}
ssh2_pkt_adduint32(pktout, epf->sport);
ssh2_pkt_send(ssh, pktout);
@@
-4733,9
+4733,9
@@
static void ssh_setup_portfwd(Ssh ssh, Conf *conf)
if (epf->saddr) {
ssh2_pkt_addstring(pktout, epf->saddr);
} else if (conf_get_int(conf, CONF_rport_acceptall)) {
if (epf->saddr) {
ssh2_pkt_addstring(pktout, epf->saddr);
} else if (conf_get_int(conf, CONF_rport_acceptall)) {
- ssh2_pkt_addstring(pktout, "
0.0.0.0
");
+ ssh2_pkt_addstring(pktout, "");
} else {
} else {
- ssh2_pkt_addstring(pktout, "
127.0.0.1
");
+ ssh2_pkt_addstring(pktout, "
localhost
");
}
ssh2_pkt_adduint32(pktout, epf->sport);
ssh2_pkt_send(ssh, pktout);
}
ssh2_pkt_adduint32(pktout, epf->sport);
ssh2_pkt_send(ssh, pktout);
@@
-9685,7
+9685,7
@@
static void ssh_free(void *handle)
while (ssh->qhead) {
struct queued_handler *qh = ssh->qhead;
ssh->qhead = qh->next;
while (ssh->qhead) {
struct queued_handler *qh = ssh->qhead;
ssh->qhead = qh->next;
- sfree(
ssh->qhead
);
+ sfree(
qh
);
}
ssh->qhead = ssh->qtail = NULL;
}
ssh->qhead = ssh->qtail = NULL;