summaryrefslogtreecommitdiff
path: root/beecrypt/dsa.c
diff options
context:
space:
mode:
Diffstat (limited to 'beecrypt/dsa.c')
-rw-r--r--beecrypt/dsa.c163
1 files changed, 65 insertions, 98 deletions
diff --git a/beecrypt/dsa.c b/beecrypt/dsa.c
index f006300db..dc2212b04 100644
--- a/beecrypt/dsa.c
+++ b/beecrypt/dsa.c
@@ -54,66 +54,66 @@ int dsasign(const mp32barrett* p, const mp32barrett* q, const mp32number* g, ran
{
register uint32 psize = p->size;
register uint32 qsize = q->size;
- /* k + inv(k) = 2 * qsize */
- /* g^k mod p = psize+4*psize+2 */
register uint32* ptemp;
register uint32* qtemp;
+
+ register uint32* pwksp;
+ register uint32* qwksp;
+
register int rc = -1; /* assume failure */
ptemp = (uint32*) malloc((5*psize+2) * sizeof(*ptemp));
if (ptemp == NULL)
return rc;
- qtemp = (uint32*) malloc((9*qsize+6) * sizeof(*qtemp));
+ qtemp = (uint32*) malloc((14*qsize+11) * sizeof(*qtemp));
if (qtemp == NULL) {
free(ptemp);
return rc;
}
- {
- register uint32* pwksp = ptemp+psize;
- register uint32* qwksp = qtemp+3*qsize;
+ pwksp = ptemp+psize;
+ qwksp = qtemp+3*qsize;
- /* allocate r */
- mp32nfree(r);
- mp32nsize(r, qsize);
+ /* allocate r */
+ mp32nfree(r);
+ mp32nsize(r, qsize);
- /* get a random k, invertible modulo q */
- mp32brndinv_w(q, rgc, qtemp, qtemp+qsize, qwksp);
+ /* get a random k, invertible modulo q */
+ mp32brndinv_w(q, rgc, qtemp, qtemp+qsize, qwksp);
-#if 0
-/* FIPS 186 test vectors for k, http://www.itl.nist.gov/fipspubs/186chg-1.htm */
- qtemp[0] = 0x358dad57;
- qtemp[1] = 0x1462710f;
- qtemp[2] = 0x50e254cf;
- qtemp[3] = 0x1a376b2b;
- qtemp[4] = 0xdeaadfbf;
+/* FIPS 186 test vectors
+ qtemp[0] = 0x358dad57;
+ qtemp[1] = 0x1462710f;
+ qtemp[2] = 0x50e254cf;
+ qtemp[3] = 0x1a376b2b;
+ qtemp[4] = 0xdeaadfbf;
- mp32binv_w(q, qsize, qtemp, qtemp+qsize, qwksp);
-#endif
+ mp32binv_w(q, qsize, qtemp, qtemp+qsize, qwksp);
+*/
- /* g^k mod p */
- mp32bpowmod_w(p, g->size, g->data, qsize, qtemp, ptemp, pwksp);
+ /* g^k mod p */
+ mp32bpowmod_w(p, g->size, g->data, qsize, qtemp, ptemp, pwksp);
- /* (g^k mod p) mod q - simple modulo */
- mp32nmod(qtemp+2*qsize, psize, ptemp, qsize, q->modl, pwksp);
- mp32copy(qsize, r->data, qtemp+psize+qsize);
+ /* (g^k mod p) mod q - simple modulo */
+ mp32nmod(qtemp+2*qsize, psize, ptemp, qsize, q->modl, pwksp);
+ mp32copy(qsize, r->data, qtemp+psize+qsize);
- /* allocate s */
- mp32nfree(s);
- mp32nsize(s, qsize);
+ /* allocate s */
+ mp32nfree(s);
+ mp32nsize(s, qsize);
- /* x*r mod q */
- mp32bmulmod_w(q, x->size, x->data, r->size, r->data, qtemp, qwksp);
+ /* x*r mod q */
+ mp32bmulmod_w(q, x->size, x->data, r->size, r->data, qtemp, qwksp);
- /* add h(m) mod q */
- mp32baddmod_w(q, qsize, qtemp, hm->size, hm->data, qtemp+2*qsize, qwksp);
+ /* add h(m) mod q */
+ mp32baddmod_w(q, qsize, qtemp, hm->size, hm->data, qtemp+2*qsize, qwksp);
- /* multiply inv(k) mod q */
- mp32bmulmod_w(q, qsize, qtemp+qsize, qsize, qtemp+2*qsize, s->data, qwksp);
- rc = 0;
+ /* multiply inv(k) mod q */
+ mp32bmulmod_w(q, qsize, qtemp+qsize, qsize, qtemp+2*qsize, s->data, qwksp);
+
+ rc = 0;
- }
free(qtemp);
free(ptemp);
@@ -124,8 +124,13 @@ int dsavrfy(const mp32barrett* p, const mp32barrett* q, const mp32number* g, con
{
register uint32 psize = p->size;
register uint32 qsize = q->size;
+
register uint32* ptemp;
register uint32* qtemp;
+
+ register uint32* pwksp;
+ register uint32* qwksp;
+
register int rc = 0; /* XXX shouldn't this be -1 ?*/
if (mp32z(r->size, r->data))
@@ -150,69 +155,31 @@ int dsavrfy(const mp32barrett* p, const mp32barrett* q, const mp32number* g, con
return rc;
}
+ pwksp = ptemp+2*psize;
+ qwksp = qtemp+2*qsize;
+
+ /* compute w = inv(s) mod q */
+ if (mp32binv_w(q, s->size, s->data, qtemp, qwksp))
{
- register uint32* pwksp = ptemp+2*psize;
- register uint32* qwksp = qtemp+2*qsize;
-
-if (_debug) {
-/*@-modfilesys@*/
-fprintf(stderr, "\t q: "), mp32println(stderr, q->size, q->modl);
-fprintf(stderr, "\t hm: "), mp32println(stderr, hm->size, hm->data);
-fprintf(stderr, "\t r: "), mp32println(stderr, r->size, r->data);
-fprintf(stderr, "\t s: "), mp32println(stderr, s->size, s->data);
-/*@=modfilesys@*/
-}
- /* compute w = inv(s) mod q */
- if (mp32binv_w(q, s->size, s->data, qtemp, qwksp))
- {
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "\t w = inv(s) mod q: "), mp32println(stderr, qsize, qtemp);
-/*@=modfilesys@*/
- /* compute u1 = h(m)*w mod q */
- mp32bmulmod_w(q, hm->size, hm->data, qsize, qtemp, qtemp+qsize, qwksp);
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "\tu1 = h(m)*w mod q: "), mp32println(stderr, qsize, qtemp+qsize);
-/*@=modfilesys@*/
-
- /* compute u2 = r*w mod q */
- mp32bmulmod_w(q, r->size, r->data, qsize, qtemp, qtemp, qwksp);
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "\tu2 = r*w mod q : "), mp32println(stderr, qsize, qtemp);
-/*@=modfilesys@*/
-
- /* compute g^u1 mod p */
- mp32bpowmod_w(p, g->size, g->data, qsize, qtemp+qsize, ptemp, pwksp);
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "\t g^u1 mod p: "), mp32println(stderr, psize, ptemp);
-/*@=modfilesys@*/
-
- /* compute y^u2 mod p */
- mp32bpowmod_w(p, y->size, y->data, qsize, qtemp, ptemp+psize, pwksp);
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "\t y^u2 mod p: "), mp32println(stderr, psize, ptemp+psize);
-/*@=modfilesys@*/
-
- /* multiply mod p */
- mp32bmulmod_w(p, psize, ptemp, psize, ptemp+psize, ptemp, pwksp);
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "\t multiply mod p: "), mp32println(stderr, psize, ptemp);
-/*@=modfilesys@*/
-
- /* modulo q */
- mp32nmod(ptemp+psize, psize, ptemp, qsize, q->modl, pwksp);
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "\tr' mod q : "), mp32println(stderr, psize, ptemp+psize);
-/*@=modfilesys@*/
-
- rc = mp32eqx(r->size, r->data, psize, ptemp+psize);
- }
+ /* compute u1 = h(m)*w mod q */
+ mp32bmulmod_w(q, hm->size, hm->data, qsize, qtemp, qtemp+qsize, qwksp);
+
+ /* compute u2 = r*w mod q */
+ mp32bmulmod_w(q, r->size, r->data, qsize, qtemp, qtemp, qwksp);
+
+ /* compute g^u1 mod p */
+ mp32bpowmod_w(p, g->size, g->data, qsize, qtemp+qsize, ptemp, pwksp);
+
+ /* compute y^u2 mod p */
+ mp32bpowmod_w(p, y->size, y->data, qsize, qtemp, ptemp+psize, pwksp);
+
+ /* multiply mod p */
+ mp32bmulmod_w(p, psize, ptemp, psize, ptemp+psize, ptemp, pwksp);
+
+ /* modulo q */
+ mp32nmod(ptemp+psize, psize, ptemp, qsize, q->modl, pwksp);
+
+ rc = mp32eqx(r->size, r->data, psize, ptemp+psize);
}
free(qtemp);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 08:42:55 +0000