subdirmk: Change stub force target to `run-main.mk'

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 81754a7370adb21623099bb89a9dac345dbce0c6..28a4c1b3225c3caefbb5a296f7582a149b63d245 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -77,7 +77,7 @@ static const char *hexchars="0123456789abcdef";
 static void rsa_sethash(struct rsacommon *c, struct hash_if *hash)
 {
     free(c->hashbuf);
-    c->hashbuf=safe_malloc(hash->len, "generate_msg");
+    c->hashbuf=safe_malloc(hash->hlen, "generate_msg");
     c->hashi=hash;
 }
 static void rsa_pub_sethash(void *sst, struct hash_if *hash)
@@ -92,9 +92,7 @@ static void rsa_priv_sethash(void *sst, struct hash_if *hash)
 }
 static void rsa_hash(struct rsacommon *c, const uint8_t *buf, int32_t len)
 {
-    void *hst=c->hashi->init();
-    c->hashi->update(hst,buf,len);
-    c->hashi->final(hst,c->hashbuf);
+    hash_hash(c->hashi,buf,len,c->hashbuf);
 }
 
 static void emsa_pkcs1(MP_INT *n, MP_INT *m,
@@ -158,7 +156,7 @@ static bool_t rsa_sign(void *sst, uint8_t *data, int32_t datalen,
 
     rsa_hash(&st->common,data,datalen);
     /* Construct the message representative. */
-    emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->len);
+    emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->hlen);
 
     /*
      * Produce an RSA signature (a^d mod n) using the Chinese
@@ -219,9 +217,9 @@ static bool_t rsa_sig_unpick(void *sst, struct buffer_if *msg,
 {
     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.
@@ -245,13 +243,13 @@ static bool_t rsa_sig_check(void *sst, uint8_t *data, int32_t datalen,
     mpz_init(&c);
 
     rsa_hash(&st->common,data,datalen);
-    emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->len);
+    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];
-    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);