#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;
+};
+
struct rsapriv {
closure_t cl;
struct sigprivkey_if ops;
struct cloc loc;
+ struct rsacommon common;
MP_INT n;
MP_INT p, dp;
MP_INT q, dq;
closure_t cl;
struct sigpubkey_if ops;
struct cloc loc;
+ struct rsacommon common;
MP_INT e;
MP_INT n;
};
static const char *hexchars="0123456789abcdef";
+static void rsa_sethash(struct rsacommon *c, struct hash_if *hash)
+{
+ free(c->hashbuf);
+ c->hashbuf=safe_malloc(hash->hlen, "generate_msg");
+ c->hashi=hash;
+}
+static void rsa_pub_sethash(void *sst, struct hash_if *hash)
+{
+ struct rsapub *st=sst;
+ rsa_sethash(&st->common, 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);
+}
+
static void emsa_pkcs1(MP_INT *n, MP_INT *m,
const uint8_t *data, int32_t datalen)
{
mpz_init(&a);
mpz_init(&b);
+ rsa_hash(&st->common,data,datalen);
/* Construct the message representative. */
- emsa_pkcs1(&st->n, &a, data, datalen);
+ emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->hlen);
/*
* Produce an RSA signature (a^d mod n) using the Chinese
mpz_init(&b);
mpz_init(&c);
- emsa_pkcs1(&st->n, &a, data, datalen);
+ rsa_hash(&st->common,data,datalen);
+ emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->hlen);
/* Terminate signature with a '0' - already checked that this will fit */
int save = sig->sigstart[sig->siglen];
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
+ st->ops.sethash=rsa_pub_sethash;
+ st->common.hashbuf=NULL;
st->ops.unpick=rsa_sig_unpick;
st->ops.check=rsa_sig_check;
st->loc=loc;
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
+ st->ops.sethash=rsa_priv_sethash;
+ st->common.hashbuf=NULL;
st->ops.sign=rsa_sign;
st->loc=loc;