projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New block cipher DESX added.
[u/mdw/catacomb]
/
pgen.c
diff --git
a/pgen.c
b/pgen.c
index
0e67c76
..
74a10bc
100644
(file)
--- a/
pgen.c
+++ b/
pgen.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: pgen.c,v 1.
5 2000/06/17 11:52:36
mdw Exp $
+ * $Id: pgen.c,v 1.
7 2001/02/03 16:05:32
mdw Exp $
*
* Prime generation glue
*
*
* Prime generation glue
*
@@
-30,6
+30,13
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: pgen.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: pgen.c,v $
+ * Revision 1.7 2001/02/03 16:05:32 mdw
+ * Now @mp_drop@ checks its argument is non-NULL before attempting to free
+ * it. Note that the macro version @MP_DROP@ doesn't do this.
+ *
+ * Revision 1.6 2000/10/08 12:11:22 mdw
+ * Use @MP_EQ@ instead of @MP_CMP@.
+ *
* Revision 1.5 2000/06/17 11:52:36 mdw
* Signal a pgen abort if the jump and base share a common factor.
*
* Revision 1.5 2000/06/17 11:52:36 mdw
* Signal a pgen abort if the jump and base share a common factor.
*
@@
-314,8
+321,7
@@
mp *pgen(const char *name, mp *d, mp *m, pgen_proc *event, void *ectx,
ev.m = 0;
}
ev.r->ops->destroy(ev.r);
ev.m = 0;
}
ev.r->ops->destroy(ev.r);
- if (d != MP_NEW)
- mp_drop(d);
+ mp_drop(d);
return (ev.m);
}
return (ev.m);
}
@@
-339,7
+345,7
@@
static int verify(dstr *v)
pf.step = 2;
p = pgen("p", MP_NEW, m, pgen_evspin, 0, 0, pgen_filter, &pf,
rabin_iters(mp_bits(m)), pgen_test, &r);
pf.step = 2;
p = pgen("p", MP_NEW, m, pgen_evspin, 0, 0, pgen_filter, &pf,
rabin_iters(mp_bits(m)), pgen_test, &r);
- if (!p ||
MP_CMP(p, !=
, q)) {
+ if (!p ||
!MP_EQ(p
, q)) {
fputs("\n*** pgen failed", stderr);
fputs("\nm = ", stderr); mp_writefile(m, stderr, 10);
fputs("\np = ", stderr); mp_writefile(p, stderr, 10);
fputs("\n*** pgen failed", stderr);
fputs("\nm = ", stderr); mp_writefile(m, stderr, 10);
fputs("\np = ", stderr); mp_writefile(p, stderr, 10);
@@
-350,8
+356,7
@@
static int verify(dstr *v)
mp_drop(m);
mp_drop(q);
mp_drop(m);
mp_drop(q);
- if (p)
- mp_drop(p);
+ mp_drop(p);
assert(mparena_count(MPARENA_GLOBAL) == 0);
return (ok);
}
assert(mparena_count(MPARENA_GLOBAL) == 0);
return (ok);
}