projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log the hash used for DH kex (now there's a choice).
[u/mdw/putty]
/
import.c
diff --git
a/import.c
b/import.c
index
25012d2
..
6c936ff
100644
(file)
--- a/
import.c
+++ b/
import.c
@@
-444,7
+444,7
@@
static struct openssh_key *load_openssh_key(const Filename *filename,
memset(ret->keyblob, 0, ret->keyblob_size);
sfree(ret->keyblob);
}
memset(ret->keyblob, 0, ret->keyblob_size);
sfree(ret->keyblob);
}
- memset(
&ret, 0, sizeof(
ret));
+ memset(
ret, 0, sizeof(*
ret));
sfree(ret);
}
if (errmsg_p) *errmsg_p = errmsg;
sfree(ret);
}
if (errmsg_p) *errmsg_p = errmsg;
@@
-461,7
+461,7
@@
int openssh_encrypted(const Filename *filename)
ret = key->encrypted;
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
ret = key->encrypted;
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
- memset(
&key, 0, sizeof(
key));
+ memset(
key, 0, sizeof(*
key));
sfree(key);
return ret;
}
sfree(key);
return ret;
}
@@
-654,7
+654,7
@@
struct ssh2_userkey *openssh_read(const Filename *filename, char *passphrase,
}
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
}
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
- memset(
&key, 0, sizeof(
key));
+ memset(
key, 0, sizeof(*
key));
sfree(key);
if (errmsg_p) *errmsg_p = errmsg;
return retval;
sfree(key);
if (errmsg_p) *errmsg_p = errmsg;
return retval;
@@
-766,6
+766,7
@@
int openssh_write(const Filename *filename, struct ssh2_userkey *key,
footer = "-----END DSA PRIVATE KEY-----\n";
} else {
assert(0); /* zoinks! */
footer = "-----END DSA PRIVATE KEY-----\n";
} else {
assert(0); /* zoinks! */
+ exit(1); /* XXX: GCC doesn't understand assert() on some systems. */
}
/*
}
/*
@@
-1098,7
+1099,7
@@
static struct sshcom_key *load_sshcom_key(const Filename *filename,
memset(ret->keyblob, 0, ret->keyblob_size);
sfree(ret->keyblob);
}
memset(ret->keyblob, 0, ret->keyblob_size);
sfree(ret->keyblob);
}
- memset(
&ret, 0, sizeof(
ret));
+ memset(
ret, 0, sizeof(*
ret));
sfree(ret);
}
if (errmsg_p) *errmsg_p = errmsg;
sfree(ret);
}
if (errmsg_p) *errmsg_p = errmsg;
@@
-1140,7
+1141,7
@@
int sshcom_encrypted(const Filename *filename, char **comment)
*comment = dupstr(key->comment);
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
*comment = dupstr(key->comment);
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
- memset(
&key, 0, sizeof(
key));
+ memset(
key, 0, sizeof(*
key));
sfree(key);
return answer;
}
sfree(key);
return answer;
}
@@
-1415,7
+1416,7
@@
struct ssh2_userkey *sshcom_read(const Filename *filename, char *passphrase,
}
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
}
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
- memset(
&key, 0, sizeof(
key));
+ memset(
key, 0, sizeof(*
key));
sfree(key);
if (errmsg_p) *errmsg_p = errmsg;
return ret;
sfree(key);
if (errmsg_p) *errmsg_p = errmsg;
return ret;
@@
-1497,6
+1498,7
@@
int sshcom_write(const Filename *filename, struct ssh2_userkey *key,
type = "dl-modp{sign{dsa-nist-sha1},dh{plain}}";
} else {
assert(0); /* zoinks! */
type = "dl-modp{sign{dsa-nist-sha1},dh{plain}}";
} else {
assert(0); /* zoinks! */
+ exit(1); /* XXX: GCC doesn't understand assert() on some systems. */
}
/*
}
/*