projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for interface change to @mpmont_expr@ and @mpmont_mexpr@.
[u/mdw/catacomb]
/
rabin.c
diff --git
a/rabin.c
b/rabin.c
index
677e233
..
e6cd488
100644
(file)
--- a/
rabin.c
+++ b/
rabin.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: rabin.c,v 1.
4 2000/06/22 19:03:02
mdw Exp $
+ * $Id: rabin.c,v 1.
6 2001/06/16 12:56:38
mdw Exp $
*
* Miller-Rabin primality test
*
*
* Miller-Rabin primality test
*
@@
-30,6
+30,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: rabin.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: rabin.c,v $
+ * Revision 1.6 2001/06/16 12:56:38 mdw
+ * Fixes for interface change to @mpmont_expr@ and @mpmont_mexpr@.
+ *
+ * Revision 1.5 2000/10/08 12:11:22 mdw
+ * Use @MP_EQ@ instead of @MP_CMP@.
+ *
* Revision 1.4 2000/06/22 19:03:02 mdw
* Use the new @mp_odd@ function.
*
* Revision 1.4 2000/06/22 19:03:02 mdw
* Use the new @mp_odd@ function.
*
@@
-117,8
+123,9
@@
int rabin_test(rabin *r, mp *g)
* @y@ here has an extra factor of %$R$%.
*/
* @y@ here has an extra factor of %$R$%.
*/
- y = mpmont_expr(&r->mm, MP_NEW, g, r->r);
- if (MP_CMP(y, ==, r->mm.r) || MP_CMP(y, ==, r->m1)) {
+ y = mpmont_mul(&r->mm, MP_NEW, g, r->mm.r2);
+ y = mpmont_expr(&r->mm, y, y, r->r);
+ if (MP_EQ(y, r->mm.r) || MP_EQ(y, r->m1)) {
rc = PGEN_PASS;
goto done;
}
rc = PGEN_PASS;
goto done;
}
@@
-133,9
+140,9
@@
int rabin_test(rabin *r, mp *g)
dd = mp_sqr(spare, y);
dd = mpmont_reduce(&r->mm, dd, dd);
spare = y; y = dd;
dd = mp_sqr(spare, y);
dd = mpmont_reduce(&r->mm, dd, dd);
spare = y; y = dd;
- if (MP_
CMP(y, ==
, r->mm.r))
+ if (MP_
EQ(y
, r->mm.r))
break;
break;
- if (MP_
CMP(y, ==
, r->m1)) {
+ if (MP_
EQ(y
, r->m1)) {
rc = PGEN_PASS;
break;
}
rc = PGEN_PASS;
break;
}