static void sha_mpint(SHA_State * s, Bignum b)
{
- unsigned char *p;
unsigned char lenbuf[4];
int len;
len = (bignum_bitcount(b) + 8) / 8;
static void sha512_mpint(SHA512_State * s, Bignum b)
{
- unsigned char *p;
unsigned char lenbuf[4];
int len;
len = (bignum_bitcount(b) + 8) / 8;
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 slen;
struct dss_key *dss;
- dss = smalloc(sizeof(struct dss_key));
+ dss = snew(struct dss_key);
if (!dss)
return NULL;
getstring(&data, &len, &p, &slen);
len += 4 * (bignum_bitcount(dss->q) + 15) / 16;
len += 4 * (bignum_bitcount(dss->g) + 15) / 16;
len += 4 * (bignum_bitcount(dss->y) + 15) / 16;
- p = smalloc(len);
+ p = snewn(len, char);
if (!p)
return NULL;
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; \
for (i = 0; i < 16; i++)
sprintf(buffer + strlen(buffer), "%s%02x", i ? ":" : "",
digest[i]);
- ret = smalloc(strlen(buffer) + 1);
+ ret = snewn(strlen(buffer) + 1, char);
if (ret)
strcpy(ret, buffer);
return ret;
/*
* 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);
* 27 + sum of lengths. (five length fields, 20+7=27).
*/
bloblen = 27 + plen + qlen + glen + ylen;
- blob = smalloc(bloblen);
+ blob = snewn(bloblen, unsigned char);
p = blob;
PUT_32BIT(p, 7);
p += 4;
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;
- blob = smalloc(bloblen);
+ bloblen = 4 + xlen;
+ blob = snewn(bloblen, unsigned char);
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;
+ }
}
/*
char **b = (char **) blob;
struct dss_key *dss;
- dss = smalloc(sizeof(struct dss_key));
+ dss = snew(struct dss_key);
if (!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:
* i.e. 4+7 + 4+40 bytes.
*/
nbytes = 4 + 7 + 4 + 40;
- bytes = smalloc(nbytes);
+ bytes = snewn(nbytes, unsigned char);
PUT_32BIT(bytes, 7);
memcpy(bytes + 4, "ssh-dss", 7);
PUT_32BIT(bytes + 4 + 7, 40);