projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stuff...
[u/mdw/catacomb]
/
rho.c
diff --git
a/rho.c
b/rho.c
index
d4530b8
..
aae4951
100644
(file)
--- a/
rho.c
+++ b/
rho.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: rho.c,v 1.
1 2000/07/09 21:32:30
mdw Exp $
+ * $Id: rho.c,v 1.
3 2001/06/16 12:56:38
mdw Exp $
*
* Pollard's rho algorithm for discrete logs
*
*
* Pollard's rho algorithm for discrete logs
*
@@
-30,6
+30,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: rho.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: rho.c,v $
+ * Revision 1.3 2001/06/16 12:56:38 mdw
+ * Fixes for interface change to @mpmont_expr@ and @mpmont_mexpr@.
+ *
+ * Revision 1.2 2000/10/08 12:11:22 mdw
+ * Use @MP_EQ@ instead of @MP_CMP@.
+ *
* Revision 1.1 2000/07/09 21:32:30 mdw
* Pollard's rho algorithm for computing discrete logs.
*
* Revision 1.1 2000/07/09 21:32:30 mdw
* Pollard's rho algorithm for computing discrete logs.
*
@@
-135,7
+141,7
@@
mp *rho(rho_ctx *cc, void *x, void *y, mp *a, mp *b)
bb = mp_sub(bb, bb, b);
g = MP_NEW;
mp_gcd(&g, &bb, 0, bb, cc->n);
bb = mp_sub(bb, bb, b);
g = MP_NEW;
mp_gcd(&g, &bb, 0, bb, cc->n);
- if (
MP_CMP(g, !=
, MP_ONE)) {
+ if (
!MP_EQ(g
, MP_ONE)) {
mp_drop(aa);
aa = 0;
} else {
mp_drop(aa);
aa = 0;
} else {
@@
-183,7
+189,7
@@
static void prime_mul(void *x, void *y, void *c)
static int prime_eq(void *x, void *y)
{
static int prime_eq(void *x, void *y)
{
- return (MP_
CMP(*(mp **)x, ==
, *(mp **)y));
+ return (MP_
EQ(*(mp **)x
, *(mp **)y));
}
static int prime_split(void *x)
}
static int prime_split(void *x)
@@
-237,14
+243,14
@@
mp *rho_prime(mp *g, mp *a, mp *n, mp *p)
/* --- The main loop --- */
while ((l = rho(&cc, &x, &y, aa, bb)) == 0) {
/* --- The main loop --- */
while ((l = rho(&cc, &x, &y, aa, bb)) == 0) {
- mp
mont_
factor f[2];
+ mp
_exp
factor f[2];
if (!r)
r = fibrand_create(0);
aa = mprand_range(MP_NEW, n, r, 0);
bb = mprand_range(MP_NEW, n, r, 0);
if (!r)
r = fibrand_create(0);
aa = mprand_range(MP_NEW, n, r, 0);
bb = mprand_range(MP_NEW, n, r, 0);
- f[0].base = g; f[0].exp = aa;
- f[1].base = a; f[1].exp = bb;
+ f[0].base =
cc.
g; f[0].exp = aa;
+ f[1].base =
cc.
a; f[1].exp = bb;
x = mpmont_mexpr(&mm, MP_NEW, f, 2);
y = MP_COPY(x);
}
x = mpmont_mexpr(&mm, MP_NEW, f, 2);
y = MP_COPY(x);
}
@@
-285,7
+291,7
@@
int main(void)
y = mpmont_exp(&mm, MP_NEW, dp.g, x);
mpmont_destroy(&mm);
l = rho_prime(dp.g, y, dp.q, dp.p);
y = mpmont_exp(&mm, MP_NEW, dp.g, x);
mpmont_destroy(&mm);
l = rho_prime(dp.g, y, dp.q, dp.p);
- if (MP_
CMP(x, ==
, l)) {
+ if (MP_
EQ(x
, l)) {
fputs(". ok\n", stdout);
ok = 1;
} else {
fputs(". ok\n", stdout);
ok = 1;
} else {