projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix leftovers bug in reading.
[u/mdw/catacomb]
/
rsa-recover.c
diff --git
a/rsa-recover.c
b/rsa-recover.c
index
304cbca
..
8052ddc
100644
(file)
--- a/
rsa-recover.c
+++ b/
rsa-recover.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: rsa-recover.c,v 1.
4 2000/07/01 11:22:22
mdw Exp $
+ * $Id: rsa-recover.c,v 1.
6 2001/06/16 12:56:38
mdw Exp $
*
* Recover RSA parameters
*
*
* Recover RSA parameters
*
@@
-30,6
+30,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: rsa-recover.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: rsa-recover.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/07/01 11:22:22 mdw
* Remove bad type name `rsa_param'.
*
* Revision 1.4 2000/07/01 11:22:22 mdw
* Remove bad type name `rsa_param'.
*
@@
-86,7
+92,7
@@
int rsa_recover(rsa_priv *rp)
mp_div(&rp->q, &r, rp->n, rp->p);
else
mp_div(&rp->p, &r, rp->n, rp->q);
mp_div(&rp->q, &r, rp->n, rp->p);
else
mp_div(&rp->p, &r, rp->n, rp->q);
- if (
MP_CMP(r, !=
, MP_ZERO)) {
+ if (
!MP_EQ(r
, MP_ZERO)) {
mp_drop(r);
return (-1);
}
mp_drop(r);
return (-1);
}
@@
-138,8
+144,9
@@
int rsa_recover(rsa_priv *rp)
*/
aw = primetab[i++];
*/
aw = primetab[i++];
- z = mpmont_expr(&mm, z, &a, t);
- if (MP_CMP(z, ==, mm.r) || MP_CMP(z, ==, m1))
+ z = mpmont_mul(&mm, z, &a, mm.r2);
+ z = mpmont_expr(&mm, z, z, t);
+ if (MP_EQ(z, mm.r) || MP_EQ(z, m1))
continue;
/* --- Now square until something interesting happens --- *
continue;
/* --- Now square until something interesting happens --- *
@@
-153,10
+160,10
@@
int rsa_recover(rsa_priv *rp)
for (;;) {
mp *zz = mp_sqr(MP_NEW, z);
zz = mpmont_reduce(&mm, zz, zz);
for (;;) {
mp *zz = mp_sqr(MP_NEW, z);
zz = mpmont_reduce(&mm, zz, zz);
- if (MP_
CMP(zz, ==
, mm.r)) {
+ if (MP_
EQ(zz
, mm.r)) {
mp_drop(zz);
goto done;
mp_drop(zz);
goto done;
- } else if (MP_
CMP(zz, ==
, m1)) {
+ } else if (MP_
EQ(zz
, m1)) {
mp_drop(zz);
goto again;
}
mp_drop(zz);
goto again;
}
@@
-227,7
+234,7
@@
int rsa_recover(rsa_priv *rp)
}
mp_drop(phi);
}
mp_drop(phi);
- if (
MP_CMP(g, !=
, MP_ONE)) {
+ if (
!MP_EQ(g
, MP_ONE)) {
mp_drop(g);
return (-1);
}
mp_drop(g);
return (-1);
}