projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Error return for Rabin-Miller context creation.
[u/mdw/catacomb]
/
gfreduce.c
diff --git
a/gfreduce.c
b/gfreduce.c
index
3969f11
..
bdf3579
100644
(file)
--- a/
gfreduce.c
+++ b/
gfreduce.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id
: gfreduce.c,v 1.1.2.1 2004/03/21 22:39:46 mdw Exp
$
+ * $Id$
*
* Efficient reduction modulo sparse binary polynomials
*
*
* Efficient reduction modulo sparse binary polynomials
*
@@
-27,14
+27,6
@@
* MA 02111-1307, USA.
*/
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: gfreduce.c,v $
- * Revision 1.1.2.1 2004/03/21 22:39:46 mdw
- * Elliptic curves on binary fields work.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <mLib/alloc.h>
/*----- Header files ------------------------------------------------------*/
#include <mLib/alloc.h>
@@
-92,7
+84,8
@@
DA_DECL(instr_v, gfreduce_instr);
void gfreduce_create(gfreduce *r, mp *p)
{
instr_v iv = DA_INIT;
void gfreduce_create(gfreduce *r, mp *p)
{
instr_v iv = DA_INIT;
- unsigned long d, dw;
+ unsigned long d;
+ unsigned dw;
mpscan sc;
unsigned long i;
gfreduce_instr *ip;
mpscan sc;
unsigned long i;
gfreduce_instr *ip;
@@
-156,8
+149,8
@@
void gfreduce_create(gfreduce *r, mp *p)
w = ww;
wi = DA_LEN(&iv);
}
w = ww;
wi = DA_LEN(&iv);
}
- INSTR(GFRI_LSL, (i - d)%MPW_BITS);
- if ((i - d)%MPW_BITS)
+ INSTR(GFRI_LSL, (
MPW_BITS +
i - d)%MPW_BITS);
+ if ((
MPW_BITS +
i - d)%MPW_BITS)
f |= f_lsr;
}
wl = DA_LEN(&iv);
f |= f_lsr;
}
wl = DA_LEN(&iv);
@@
-345,7
+338,7
@@
int gfreduce_trace(gfreduce *r, mp *x)
y = gfreduce_do(r, t, t);
y = gf_add(y, y, x);
}
y = gfreduce_do(r, t, t);
y = gf_add(y, y, x);
}
- rc = !MP_
ISZERO
(y);
+ rc = !MP_
ZEROP
(y);
mp_drop(spare);
mp_drop(y);
return (rc);
mp_drop(spare);
mp_drop(y);
return (rc);
@@
-417,7
+410,7
@@
mp *gfreduce_quadsolve(gfreduce *r, mp *d, mp *x)
z = gf_add(z, z, t);
w = gf_add(w, w, rho);
}
z = gf_add(z, z, t);
w = gf_add(w, w, rho);
}
- if (!MP_
ISZERO
(w))
+ if (!MP_
ZEROP
(w))
break;
MP_DROP(z);
MP_DROP(w);
break;
MP_DROP(z);
MP_DROP(w);
@@
-437,7
+430,7
@@
mp *gfreduce_quadsolve(gfreduce *r, mp *d, mp *x)
}
MP_DROP(t);
MP_DROP(x);
}
MP_DROP(t);
MP_DROP(x);
- d->v[0] &= ~(mpw)1;
+
if (d)
d->v[0] &= ~(mpw)1;
return (d);
}
return (d);
}
@@
-457,13
+450,19
@@
mp *gfreduce_exp(gfreduce *gr, mp *d, mp *a, mp *e)
mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;
MP_SHRINK(e);
mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;
MP_SHRINK(e);
- if (!MP_LEN(e))
+ MP_COPY(a);
+ if (MP_ZEROP(e))
;
;
- else if (MP_LEN(e) < EXP_THRESH)
- EXP_SIMPLE(x, a, e);
- else
- EXP_WINDOW(x, a, e);
+ else {
+ if (MP_NEGP(e))
+ a = gf_modinv(a, a, gr->p);
+ if (MP_LEN(e) < EXP_THRESH)
+ EXP_SIMPLE(x, a, e);
+ else
+ EXP_WINDOW(x, a, e);
+ }
mp_drop(d);
mp_drop(d);
+ mp_drop(a);
mp_drop(spare);
return (x);
}
mp_drop(spare);
return (x);
}