~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a second passphrase prompt to protect against typos
[sgt/putty]
/
ssh.c
diff --git
a/ssh.c
b/ssh.c
index
342bc53
..
85324b2
100644
(file)
--- a/
ssh.c
+++ b/
ssh.c
@@
-392,6
+392,12
@@
next_packet:
if (cipher)
cipher->decrypt(pktin.data, st->biglen);
if (cipher)
cipher->decrypt(pktin.data, st->biglen);
+#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
pktin.type = pktin.data[st->pad];
pktin.body = pktin.data + st->pad + 1;
pktin.type = pktin.data[st->pad];
pktin.body = pktin.data + st->pad + 1;
@@
-599,6
+605,12
@@
static void s_wrpkt(void) {
PUT_32BIT(pktout.data+biglen, crc);
PUT_32BIT(pktout.data, len);
PUT_32BIT(pktout.data+biglen, crc);
PUT_32BIT(pktout.data, len);
+#if 0
+ debug(("Sending packet len=%d\r\n", biglen+4));
+ for (i = 0; i < biglen+4; i++)
+ debug((" %02x", (unsigned char)pktout.data[i]));
+ debug(("\r\n"));
+#endif
if (cipher)
cipher->encrypt(pktout.data+4, biglen);
if (cipher)
cipher->encrypt(pktout.data+4, biglen);
@@
-1519,7
+1531,7
@@
static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
static unsigned char buffer[32];
tried_publickey = 1;
static unsigned char buffer[32];
tried_publickey = 1;
- i = loadrsakey(cfg.keyfile, &pubkey, password);
+ i = loadrsakey(cfg.keyfile, &pubkey,
NULL,
password);
if (i == 0) {
c_write("Couldn't load public key from ", 30);
c_write(cfg.keyfile, strlen(cfg.keyfile));
if (i == 0) {
c_write("Couldn't load public key from ", 30);
c_write(cfg.keyfile, strlen(cfg.keyfile));