~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More consistently defend against division by zero with assertions. We
[sgt/putty]
/
sshdss.c
diff --git
a/sshdss.c
b/sshdss.c
index
7c95d11
..
eba03aa
100644
(file)
--- a/
sshdss.c
+++ b/
sshdss.c
@@
-20,7
+20,7
@@
static void sha_mpint(SHA_State * s, Bignum b)
lenbuf[0] = bignum_byte(b, len);
SHA_Bytes(s, lenbuf, 1);
}
lenbuf[0] = bignum_byte(b, len);
SHA_Bytes(s, lenbuf, 1);
}
-
memset(lenbuf, 0
, sizeof(lenbuf));
+
smemclr(lenbuf
, sizeof(lenbuf));
}
static void sha512_mpint(SHA512_State * s, Bignum b)
}
static void sha512_mpint(SHA512_State * s, Bignum b)
@@
-34,7
+34,7
@@
static void sha512_mpint(SHA512_State * s, Bignum b)
lenbuf[0] = bignum_byte(b, len);
SHA512_Bytes(s, lenbuf, 1);
}
lenbuf[0] = bignum_byte(b, len);
SHA512_Bytes(s, lenbuf, 1);
}
-
memset(lenbuf, 0
, sizeof(lenbuf));
+
smemclr(lenbuf
, sizeof(lenbuf));
}
static void getstring(char **data, int *datalen, char **p, int *length)
}
static void getstring(char **data, int *datalen, char **p, int *length)
@@
-42,7
+42,9
@@
static void getstring(char **data, int *datalen, char **p, int *length)
*p = NULL;
if (*datalen < 4)
return;
*p = NULL;
if (*datalen < 4)
return;
- *length = GET_32BIT(*data);
+ *length = toint(GET_32BIT(*data));
+ if (*length < 0)
+ return;
*datalen -= 4;
*data += 4;
if (*datalen < *length)
*datalen -= 4;
*data += 4;
if (*datalen < *length)
@@
-70,6
+72,9
@@
static Bignum get160(char **data, int *datalen)
{
Bignum b;
{
Bignum b;
+ if (*datalen < 20)
+ return NULL;
+
b = bignum_from_bytes((unsigned char *)*data, 20);
*data += 20;
*datalen -= 20;
b = bignum_from_bytes((unsigned char *)*data, 20);
*data += 20;
*datalen -= 20;
@@
-77,6
+82,8
@@
static Bignum get160(char **data, int *datalen)
return b;
}
return b;
}
+static void dss_freekey(void *key); /* forward reference */
+
static void *dss_newkey(char *data, int len)
{
char *p;
static void *dss_newkey(char *data, int len)
{
char *p;
@@
-84,8
+91,6
@@
static void *dss_newkey(char *data, int len)
struct dss_key *dss;
dss = snew(struct dss_key);
struct dss_key *dss;
dss = snew(struct dss_key);
- if (!dss)
- return NULL;
getstring(&data, &len, &p, &slen);
#ifdef DEBUG_DSS
getstring(&data, &len, &p, &slen);
#ifdef DEBUG_DSS
@@
-98,7
+103,7
@@
static void *dss_newkey(char *data, int len)
}
#endif
}
#endif
- if (!p || memcmp(p, "ssh-dss", 7)) {
+ if (!p ||
slen != 7 ||
memcmp(p, "ssh-dss", 7)) {
sfree(dss);
return NULL;
}
sfree(dss);
return NULL;
}
@@
-106,6
+111,14
@@
static void *dss_newkey(char *data, int len)
dss->q = getmp(&data, &len);
dss->g = getmp(&data, &len);
dss->y = getmp(&data, &len);
dss->q = getmp(&data, &len);
dss->g = getmp(&data, &len);
dss->y = getmp(&data, &len);
+ dss->x = NULL;
+
+ if (!dss->p || !dss->q || !dss->g || !dss->y ||
+ !bignum_cmp(dss->q, Zero) || !bignum_cmp(dss->p, Zero)) {
+ /* Invalid key. */
+ dss_freekey(dss);
+ return NULL;
+ }
return dss;
}
return dss;
}
@@
-113,10
+126,16
@@
static void *dss_newkey(char *data, int len)
static void dss_freekey(void *key)
{
struct dss_key *dss = (struct dss_key *) key;
static void dss_freekey(void *key)
{
struct dss_key *dss = (struct dss_key *) key;
- freebn(dss->p);
- freebn(dss->q);
- freebn(dss->g);
- freebn(dss->y);
+ if (dss->p)
+ freebn(dss->p);
+ if (dss->q)
+ freebn(dss->q);
+ if (dss->g)
+ freebn(dss->g);
+ if (dss->y)
+ freebn(dss->y);
+ if (dss->x)
+ freebn(dss->x);
sfree(dss);
}
sfree(dss);
}
@@
-287,6
+306,8
@@
static int dss_verifysig(void *key, char *sig, int siglen,
freebn(w);
freebn(sha);
freebn(w);
freebn(sha);
+ freebn(u1);
+ freebn(u2);
freebn(gu1p);
freebn(yu2p);
freebn(gu1yu2p);
freebn(gu1p);
freebn(yu2p);
freebn(gu1yu2p);
@@
-377,7
+398,13
@@
static void *dss_createkey(unsigned char *pub_blob, int pub_len,
Bignum ytest;
dss = dss_newkey((char *) pub_blob, pub_len);
Bignum ytest;
dss = dss_newkey((char *) pub_blob, pub_len);
+ if (!dss)
+ return NULL;
dss->x = getmp(&pb, &priv_len);
dss->x = getmp(&pb, &priv_len);
+ if (!dss->x) {
+ dss_freekey(dss);
+ return NULL;
+ }
/*
* Check the obsolete hash in the old DSS key format.
/*
* Check the obsolete hash in the old DSS key format.
@@
-402,6
+429,7
@@
static void *dss_createkey(unsigned char *pub_blob, int pub_len,
ytest = modpow(dss->g, dss->x, dss->p);
if (0 != bignum_cmp(ytest, dss->y)) {
dss_freekey(dss);
ytest = modpow(dss->g, dss->x, dss->p);
if (0 != bignum_cmp(ytest, dss->y)) {
dss_freekey(dss);
+ freebn(ytest);
return NULL;
}
freebn(ytest);
return NULL;
}
freebn(ytest);
@@
-415,8
+443,6
@@
static void *dss_openssh_createkey(unsigned char **blob, int *len)
struct dss_key *dss;
dss = snew(struct dss_key);
struct dss_key *dss;
dss = snew(struct dss_key);
- if (!dss)
- return NULL;
dss->p = getmp(b, len);
dss->q = getmp(b, len);
dss->p = getmp(b, len);
dss->q = getmp(b, len);
@@
-424,14
+450,11
@@
static void *dss_openssh_createkey(unsigned char **blob, int *len)
dss->y = getmp(b, len);
dss->x = getmp(b, len);
dss->y = getmp(b, len);
dss->x = getmp(b, len);
- if (!dss->p || !dss->q || !dss->g || !dss->y || !dss->x) {
- sfree(dss->p);
- sfree(dss->q);
- sfree(dss->g);
- sfree(dss->y);
- sfree(dss->x);
- sfree(dss);
- return NULL;
+ if (!dss->p || !dss->q || !dss->g || !dss->y || !dss->x ||
+ !bignum_cmp(dss->q, Zero) || !bignum_cmp(dss->p, Zero)) {
+ /* Invalid key. */
+ dss_freekey(dss);
+ return NULL;
}
return dss;
}
return dss;
@@
-471,6
+494,8
@@
static int dss_pubkey_bits(void *blob, int len)
int ret;
dss = dss_newkey((char *) blob, len);
int ret;
dss = dss_newkey((char *) blob, len);
+ if (!dss)
+ return -1;
ret = bignum_bitcount(dss->p);
dss_freekey(dss);
ret = bignum_bitcount(dss->p);
dss_freekey(dss);
@@
-575,7
+600,7
@@
static unsigned char *dss_sign(void *key, char *data, int datalen, int *siglen)
SHA512_Bytes(&ss, digest, sizeof(digest));
SHA512_Final(&ss, digest512);
SHA512_Bytes(&ss, digest, sizeof(digest));
SHA512_Final(&ss, digest512);
-
memset(&ss, 0
, sizeof(ss));
+
smemclr(&ss
, sizeof(ss));
/*
* Now convert the result into a bignum, and reduce it mod q.
/*
* Now convert the result into a bignum, and reduce it mod q.
@@
-584,7
+609,7
@@
static unsigned char *dss_sign(void *key, char *data, int datalen, int *siglen)
k = bigmod(proto_k, dss->q);
freebn(proto_k);
k = bigmod(proto_k, dss->q);
freebn(proto_k);
-
memset(digest512, 0
, sizeof(digest512));
+
smemclr(digest512
, sizeof(digest512));
/*
* Now we have k, so just go ahead and compute the signature.
/*
* Now we have k, so just go ahead and compute the signature.