#define mpp(s,n) do { char *p = mpz_get_str(NULL,16,n); printf("%s 0x%sL\n", s, p); free(p); } while (0)
struct rsacommon {
- struct hash_if *hashi;
uint8_t *hashbuf;
};
static const char *hexchars="0123456789abcdef";
-static void rsa_sethash(struct rsacommon *c, struct hash_if *hash)
+static void rsa_sethash(struct rsacommon *c, struct hash_if *hash,
+ const struct hash_if **in_ops)
{
free(c->hashbuf);
c->hashbuf=safe_malloc(hash->hlen, "generate_msg");
- c->hashi=hash;
+ *in_ops=hash;
}
static void rsa_pub_sethash(void *sst, struct hash_if *hash)
{
struct rsapub *st=sst;
- rsa_sethash(&st->common, hash);
+ rsa_sethash(&st->common, hash, &st->ops.hash);
}
static void rsa_priv_sethash(void *sst, struct hash_if *hash)
{
struct rsapriv *st=sst;
- rsa_sethash(&st->common, hash);
-}
-static void rsa_hash(struct rsacommon *c, const uint8_t *buf, int32_t len)
-{
- hash_hash(c->hashi,buf,len,c->hashbuf);
+ rsa_sethash(&st->common, hash, &st->ops.hash);
}
static void emsa_pkcs1(MP_INT *n, MP_INT *m,
msize=mpz_sizeinbase(n, 16);
if (datalen*2+6>=msize) {
- fatal("rsa_sign: message too big");
+ fatal("rsa: message too big");
}
strcpy(buff,"0001");
mpz_init(&a);
mpz_init(&b);
- rsa_hash(&st->common,data,datalen);
+ hash_hash(st->ops.hash,data,datalen,st->common.hashbuf);
/* Construct the message representative. */
- emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->hlen);
+ emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->ops.hash->hlen);
/*
* Produce an RSA signature (a^d mod n) using the Chinese
{
uint8_t *lp = buf_unprepend(msg, 2);
if (!lp) return False;
- sig->siglen = get_uint16(lp);
- sig->sigstart = buf_unprepend(msg, sig->siglen);
- if (!sig->sigstart) return False;
+ sig->len = get_uint16(lp);
+ sig->start = buf_unprepend(msg, sig->len);
+ if (!sig->start) return False;
/* In `rsa_sig_check' below, we assume that we can write a nul
* terminator following the signature. Make sure there's enough space.
mpz_init(&b);
mpz_init(&c);
- rsa_hash(&st->common,data,datalen);
- emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->hlen);
+ hash_hash(st->ops.hash,data,datalen,st->common.hashbuf);
+ emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->ops.hash->hlen);
/* Terminate signature with a '0' - already checked that this will fit */
- int save = sig->sigstart[sig->siglen];
- sig->sigstart[sig->siglen] = 0;
- mpz_set_str(&b, sig->sigstart, 16);
- sig->sigstart[sig->siglen] = save;
+ int save = sig->start[sig->len];
+ sig->start[sig->len] = 0;
+ mpz_set_str(&b, sig->start, 16);
+ sig->start[sig->len] = save;
mpz_powm(&c, &b, &st->e, &st->n);
st->common.hashbuf=NULL;
st->ops.unpick=rsa_sig_unpick;
st->ops.check=rsa_sig_check;
+ st->ops.hash=0;
+ st->ops.dispose=0; /* xxx */
st->loc=loc;
i=list_elem(args,0);
st->ops.sethash=rsa_priv_sethash;
st->common.hashbuf=NULL;
st->ops.sign=rsa_sign;
+ st->ops.hash=0;
+ st->ops.dispose=0; /* xxx */
st->loc=loc;
/* Argument is filename pointing to SSH1 private key file */