return NULL;
if (p[0] & 0x80)
return NULL; /* negative mp */
- b = bignum_from_bytes(p, length);
+ b = bignum_from_bytes((unsigned char *)p, length);
return b;
}
{
Bignum b;
- b = bignum_from_bytes(*data, 20);
+ b = bignum_from_bytes((unsigned char *)*data, 20);
*data += 20;
*datalen -= 20;
int numlen, i;
MD5Init(&md5c);
- MD5Update(&md5c, "\0\0\0\7ssh-dss", 11);
+ MD5Update(&md5c, (unsigned char *)"\0\0\0\7ssh-dss", 11);
#define ADD_BIGNUM(bignum) \
numlen = (bignum_bitcount(bignum)+8)/8; \
/*
* Step 2. u1 <- SHA(message) * w mod q.
*/
- SHA_Simple(data, datalen, hash);
+ SHA_Simple(data, datalen, (unsigned char *)hash);
p = hash;
slen = 20;
sha = get160(&p, &slen);
int xlen, bloblen;
int i;
unsigned char *blob, *p;
- SHA_State s;
- unsigned char digest[20];
xlen = (bignum_bitcount(dss->x) + 8) / 8;
/*
- * mpint x, string[20] the SHA of p||q||g. Total 28 + xlen.
- * (two length fields and twenty bytes, 20+8=28).
+ * mpint x, string[20] the SHA of p||q||g. Total 4 + xlen.
*/
- bloblen = 28 + xlen;
+ bloblen = 4 + xlen;
blob = smalloc(bloblen);
p = blob;
PUT_32BIT(p, xlen);
p += 4;
for (i = xlen; i--;)
*p++ = bignum_byte(dss->x, i);
- PUT_32BIT(p, 20);
- SHA_Init(&s);
- sha_mpint(&s, dss->p);
- sha_mpint(&s, dss->q);
- sha_mpint(&s, dss->g);
- SHA_Final(&s, digest);
- p += 4;
- for (i = 0; i < 20; i++)
- *p++ = digest[i];
assert(p == blob + bloblen);
*len = bloblen;
return blob;
dss = dss_newkey((char *) pub_blob, pub_len);
dss->x = getmp(&pb, &priv_len);
- getstring(&pb, &priv_len, &hash, &hashlen);
/*
- * Verify details of the key. First check that the hash is
- * indeed a hash of p||q||g.
+ * Check the obsolete hash in the old DSS key format.
*/
- if (hashlen != 20) {
- dss_freekey(dss);
- return NULL;
- }
- SHA_Init(&s);
- sha_mpint(&s, dss->p);
- sha_mpint(&s, dss->q);
- sha_mpint(&s, dss->g);
- SHA_Final(&s, digest);
- if (0 != memcmp(hash, digest, 20)) {
- dss_freekey(dss);
- return NULL;
+ hashlen = -1;
+ getstring(&pb, &priv_len, &hash, &hashlen);
+ if (hashlen == 20) {
+ SHA_Init(&s);
+ sha_mpint(&s, dss->p);
+ sha_mpint(&s, dss->q);
+ sha_mpint(&s, dss->g);
+ SHA_Final(&s, digest);
+ if (0 != memcmp(hash, digest, 20)) {
+ dss_freekey(dss);
+ return NULL;
+ }
}
/*
return bloblen;
}
-unsigned char *dss_sign(void *key, char *data, int datalen, int *siglen)
+static unsigned char *dss_sign(void *key, char *data, int datalen, int *siglen)
{
/*
* The basic DSS signing algorithm is: