projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lim-Lee prime generation.
[u/mdw/catacomb]
/
mpbarrett.c
diff --git
a/mpbarrett.c
b/mpbarrett.c
index
711b7ab
..
aaa1bb7
100644
(file)
--- a/
mpbarrett.c
+++ b/
mpbarrett.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: mpbarrett.c,v 1.
3 1999/12/12 15:08:52
mdw Exp $
+ * $Id: mpbarrett.c,v 1.
4 2000/06/17 11:45:09
mdw Exp $
*
* Barrett modular reduction
*
*
* Barrett modular reduction
*
@@
-30,6
+30,11
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: mpbarrett.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: mpbarrett.c,v $
+ * Revision 1.4 2000/06/17 11:45:09 mdw
+ * Major memory management overhaul. Added arena support. Use the secure
+ * arena for secret integers. Replace and improve the MP management macros
+ * (e.g., replace MP_MODIFY by MP_DEST).
+ *
* Revision 1.3 1999/12/12 15:08:52 mdw
* Don't bother shifting %$q$% in @mpbarrett_reduce@, just skip the least
* significant digits.
* Revision 1.3 1999/12/12 15:08:52 mdw
* Don't bother shifting %$q$% in @mpbarrett_reduce@, just skip the least
* significant digits.
@@
-73,7
+78,7
@@
void mpbarrett_create(mpbarrett *mb, mp *m)
mp_shrink(m);
mb->k = MP_LEN(m);
mb->m = MP_COPY(m);
mp_shrink(m);
mb->k = MP_LEN(m);
mb->m = MP_COPY(m);
- b = mp_
create(2 * mb->k + 1
);
+ b = mp_
new(2 * mb->k + 1, 0
);
MPX_ZERO(b->v, b->vl - 1);
b->vl[-1] = 1;
mp_div(&b, 0, b, m);
MPX_ZERO(b->v, b->vl - 1);
b->vl[-1] = 1;
mp_div(&b, 0, b, m);
@@
-118,7
+123,8
@@
mp *mpbarrett_reduce(mpbarrett *mb, mp *d, mp *m)
if (MP_LEN(m) < k) {
m = MP_COPY(m);
if (MP_LEN(m) < k) {
m = MP_COPY(m);
- MP_DROP(d);
+ if (d)
+ MP_DROP(d);
return (m);
}
return (m);
}
@@
-130,7
+136,8
@@
mp *mpbarrett_reduce(mpbarrett *mb, mp *d, mp *m)
q = mp_mul(MP_NEW, &qq, mb->mu);
if (MP_LEN(q) <= k) {
m = MP_COPY(m);
q = mp_mul(MP_NEW, &qq, mb->mu);
if (MP_LEN(q) <= k) {
m = MP_COPY(m);
- MP_DROP(d);
+ if (d)
+ MP_DROP(d);
return (m);
}
}
return (m);
}
}
@@
-146,10
+153,9
@@
mp *mpbarrett_reduce(mpbarrett *mb, mp *d, mp *m)
mvl = m->vl;
else
mvl = m->v + k + 1;
mvl = m->vl;
else
mvl = m->v + k + 1;
- r = mp_
create(k + 1
);
+ r = mp_
new(k + 1, (q->f | mb->m->f) & MP_BURN
);
mpx_umul(r->v, r->vl, q->v + k + 1, q->vl, mb->m->v, mb->m->vl);
mpx_umul(r->v, r->vl, q->v + k + 1, q->vl, mb->m->v, mb->m->vl);
- r->f = (q->f | mb->m->f) & MP_BURN;
- MP_MODIFY(d, k + 1);
+ MP_DEST(d, k + 1, r->f);
mpx_usub(d->v, d->vl, m->v, mvl, r->v, r->vl);
d->f = (m->f | r->f) & MP_BURN;
MP_DROP(r);
mpx_usub(d->v, d->vl, m->v, mvl, r->v, r->vl);
d->f = (m->f | r->f) & MP_BURN;
MP_DROP(r);
@@
-185,6
+191,8
@@
mp *mpbarrett_exp(mpbarrett *mb, mp *d, mp *a, mp *e)
a = MP_COPY(a);
mp_scan(&sc, e);
a = MP_COPY(a);
mp_scan(&sc, e);
+ if (e->f & MP_BURN)
+ spare = MP_NEWSEC;
if (MP_STEP(&sc)) {
size_t sq = 0;
for (;;) {
if (MP_STEP(&sc)) {
size_t sq = 0;
for (;;) {