#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
#include "ssh.h"
if (!dss->p)
return NULL;
len = 8 + 4 + 1; /* 4 x "0x", punctuation, \0 */
- len += 4 * (ssh1_bignum_bitcount(dss->p)+15)/16;
- len += 4 * (ssh1_bignum_bitcount(dss->q)+15)/16;
- len += 4 * (ssh1_bignum_bitcount(dss->g)+15)/16;
- len += 4 * (ssh1_bignum_bitcount(dss->y)+15)/16;
+ len += 4 * (bignum_bitcount(dss->p)+15)/16;
+ 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);
if (!p) return NULL;
pos = 0;
pos += sprintf(p+pos, "0x");
- nibbles = (3 + ssh1_bignum_bitcount(dss->p))/4; if (nibbles<1) nibbles=1;
+ nibbles = (3 + bignum_bitcount(dss->p))/4; if (nibbles<1) nibbles=1;
for (i=nibbles; i-- ;)
p[pos++] = hex[(bignum_byte(dss->p, i/2) >> (4*(i%2))) & 0xF];
pos += sprintf(p+pos, ",0x");
- nibbles = (3 + ssh1_bignum_bitcount(dss->q))/4; if (nibbles<1) nibbles=1;
+ nibbles = (3 + bignum_bitcount(dss->q))/4; if (nibbles<1) nibbles=1;
for (i=nibbles; i-- ;)
p[pos++] = hex[(bignum_byte(dss->q, i/2) >> (4*(i%2))) & 0xF];
pos += sprintf(p+pos, ",0x");
- nibbles = (3 + ssh1_bignum_bitcount(dss->g))/4; if (nibbles<1) nibbles=1;
+ nibbles = (3 + bignum_bitcount(dss->g))/4; if (nibbles<1) nibbles=1;
for (i=nibbles; i-- ;)
p[pos++] = hex[(bignum_byte(dss->g, i/2) >> (4*(i%2))) & 0xF];
pos += sprintf(p+pos, ",0x");
- nibbles = (3 + ssh1_bignum_bitcount(dss->y))/4; if (nibbles<1) nibbles=1;
+ nibbles = (3 + bignum_bitcount(dss->y))/4; if (nibbles<1) nibbles=1;
for (i=nibbles; i-- ;)
p[pos++] = hex[(bignum_byte(dss->y, i/2) >> (4*(i%2))) & 0xF];
p[pos] = '\0';
MD5Update(&md5c, "\0\0\0\7ssh-dss", 11);
#define ADD_BIGNUM(bignum) \
- numlen = (ssh1_bignum_bitcount(bignum)+8)/8; \
+ numlen = (bignum_bitcount(bignum)+8)/8; \
PUT_32BIT(lenbuf, numlen); MD5Update(&md5c, lenbuf, 4); \
for (i = numlen; i-- ;) { \
unsigned char c = bignum_byte(bignum, i); \
MD5Final(digest, &md5c);
- sprintf(buffer, "%d ", ssh1_bignum_bitcount(dss->p));
+ sprintf(buffer, "ssh-dss %d ", bignum_bitcount(dss->p));
for (i = 0; i < 16; i++)
sprintf(buffer+strlen(buffer), "%s%02x", i?":":"", digest[i]);
ret = smalloc(strlen(buffer)+1);
*/
if (siglen != 40) { /* bug not present; read admin fields */
getstring(&sig, &siglen, &p, &slen);
- if (!p || memcmp(p, "ssh-dss", 7)) {
+ if (!p || slen != 7 || memcmp(p, "ssh-dss", 7)) {
return 0;
}
sig += 4, siglen -= 4; /* skip yet another length field */
return ret;
}
-int dss_sign(void *key, char *sig, int siglen,
- char *data, int datalen) {
- return 0; /* do nothing */
+static unsigned char *dss_public_blob(void *key, int *len) {
+ struct dss_key *dss = (struct dss_key *)key;
+ int plen, qlen, glen, ylen, bloblen;
+ int i;
+ unsigned char *blob, *p;
+
+ plen = (bignum_bitcount(dss->p)+8)/8;
+ qlen = (bignum_bitcount(dss->q)+8)/8;
+ glen = (bignum_bitcount(dss->g)+8)/8;
+ ylen = (bignum_bitcount(dss->y)+8)/8;
+
+ /*
+ * string "ssh-dss", mpint p, mpint q, mpint g, mpint y. Total
+ * 27 + sum of lengths. (five length fields, 20+7=27).
+ */
+ bloblen = 27+plen+qlen+glen+ylen;
+ blob = smalloc(bloblen);
+ p = blob;
+ PUT_32BIT(p, 7); p += 4;
+ memcpy(p, "ssh-dss", 7); p += 7;
+ PUT_32BIT(p, plen); p += 4;
+ for (i = plen; i-- ;) *p++ = bignum_byte(dss->p, i);
+ PUT_32BIT(p, qlen); p += 4;
+ for (i = qlen; i-- ;) *p++ = bignum_byte(dss->q, i);
+ PUT_32BIT(p, glen); p += 4;
+ for (i = glen; i-- ;) *p++ = bignum_byte(dss->g, i);
+ PUT_32BIT(p, ylen); p += 4;
+ for (i = ylen; i-- ;) *p++ = bignum_byte(dss->y, i);
+ assert(p == blob + bloblen);
+ *len = bloblen;
+ return blob;
+}
+
+static unsigned char *dss_private_blob(void *key, int *len) {
+ return NULL; /* can't handle DSS private keys */
+}
+
+static void *dss_createkey(unsigned char *pub_blob, int pub_len,
+ unsigned char *priv_blob, int priv_len) {
+ return NULL; /* can't handle DSS private keys */
+}
+
+static void *dss_openssh_createkey(unsigned char **blob, int *len) {
+ return NULL; /* can't handle DSS private keys */
+}
+
+static int dss_openssh_fmtkey(void *key, unsigned char *blob, int len) {
+ return -1; /* can't handle DSS private keys */
+}
+
+unsigned char *dss_sign(void *key, char *data, int datalen, int *siglen) {
+ return NULL; /* can't handle DSS private keys */
}
-struct ssh_signkey ssh_dss = {
+const struct ssh_signkey ssh_dss = {
dss_newkey,
dss_freekey,
dss_fmtkey,
+ dss_public_blob,
+ dss_private_blob,
+ dss_createkey,
+ dss_openssh_createkey,
+ dss_openssh_fmtkey,
dss_fingerprint,
dss_verifysig,
dss_sign,