projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the CRC32 compensation attack detector that all other SSH
[u/mdw/putty]
/
ssh.c
diff --git
a/ssh.c
b/ssh.c
index
6ff530f
..
b8abc5b
100644
(file)
--- a/
ssh.c
+++ b/
ssh.c
@@
-724,6
+724,11
@@
static int ssh1_rdpkt(unsigned char **data, int *datalen)
st->to_read -= st->chunk;
}
st->to_read -= st->chunk;
}
+ if (cipher && detect_attack(pktin.data, st->biglen, NULL)) {
+ bombout(("Network attack (CRC compensation) detected!"));
+ crReturn(0);
+ }
+
if (cipher)
cipher->decrypt(pktin.data, st->biglen);
if (cipher)
cipher->decrypt(pktin.data, st->biglen);
@@
-1854,7
+1859,7
@@
static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
struct RSAKey servkey, hostkey;
struct MD5Context md5c;
static unsigned long supported_ciphers_mask, supported_auths_mask;
struct RSAKey servkey, hostkey;
struct MD5Context md5c;
static unsigned long supported_ciphers_mask, supported_auths_mask;
- static int tried_publickey;
+ static int tried_publickey
, tried_agent
;
static int tis_auth_refused, ccard_auth_refused;
static unsigned char session_id[16];
static int cipher_type;
static int tis_auth_refused, ccard_auth_refused;
static unsigned char session_id[16];
static int cipher_type;
@@
-2105,7
+2110,7
@@
static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
crWaitUntil(ispkt);
crWaitUntil(ispkt);
- tried_publickey = 0;
+ tried_publickey =
tried_agent =
0;
tis_auth_refused = ccard_auth_refused = 0;
/* Load the public half of cfg.keyfile so we notice if it's in Pageant */
if (*cfg.keyfile) {
tis_auth_refused = ccard_auth_refused = 0;
/* Load the public half of cfg.keyfile so we notice if it's in Pageant */
if (*cfg.keyfile) {
@@
-2122,7
+2127,7
@@
static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
static int pwpkt_type;
pwpkt_type = SSH1_CMSG_AUTH_PASSWORD;
static int pwpkt_type;
pwpkt_type = SSH1_CMSG_AUTH_PASSWORD;
- if (agent_exists()) {
+ if (agent_exists()
&& !tried_agent
) {
/*
* Attempt RSA authentication using Pageant.
*/
/*
* Attempt RSA authentication using Pageant.
*/
@@
-2132,6
+2137,7
@@
static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
static int authed = FALSE;
void *r;
static int authed = FALSE;
void *r;
+ tried_agent = 1;
logevent("Pageant is running. Requesting keys.");
/* Request the keys held by the agent. */
logevent("Pageant is running. Requesting keys.");
/* Request the keys held by the agent. */