projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a memory leak in key generation.
[u/mdw/putty]
/
ssh.c
diff --git
a/ssh.c
b/ssh.c
index
3d23aa0
..
60ddefc
100644
(file)
--- a/
ssh.c
+++ b/
ssh.c
@@
-3222,7
+3222,7
@@
static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
while (pktin->type == SSH1_SMSG_FAILURE) {
s->pwpkt_type = SSH1_CMSG_AUTH_PASSWORD;
while (pktin->type == SSH1_SMSG_FAILURE) {
s->pwpkt_type = SSH1_CMSG_AUTH_PASSWORD;
- if (agent_exists() && !s->tried_agent) {
+ if (
ssh->cfg.tryagent &&
agent_exists() && !s->tried_agent) {
/*
* Attempt RSA authentication using Pageant.
*/
/*
* Attempt RSA authentication using Pageant.
*/
@@
-6613,7
+6613,7
@@
static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
s->nkeys = 0;
s->agent_response = NULL;
s->pkblob_in_agent = NULL;
s->nkeys = 0;
s->agent_response = NULL;
s->pkblob_in_agent = NULL;
- if (agent_exists()) {
+ if (
ssh->cfg.tryagent &&
agent_exists()) {
void *r;
void *r;
@@
-8690,8
+8690,11
@@
void ssh_send_port_open(void *channel, char *hostname, int port, char *org)
* too much hassle to keep track, and partly I'm not
* convinced the server should be told details like that
* about my local network configuration.
* too much hassle to keep track, and partly I'm not
* convinced the server should be told details like that
* about my local network configuration.
+ * The "originator IP address" is syntactically a numeric
+ * IP address, and some servers (e.g., Tectia) get upset
+ * if it doesn't match this syntax.
*/
*/
- ssh2_pkt_addstring(pktout, "
client-side-connection
");
+ ssh2_pkt_addstring(pktout, "
0.0.0.0
");
ssh2_pkt_adduint32(pktout, 0);
ssh2_pkt_send(ssh, pktout);
}
ssh2_pkt_adduint32(pktout, 0);
ssh2_pkt_send(ssh, pktout);
}