Cleanups.

[u/mdw/catacomb] / strongprime.c

diff --git a/strongprime.c b/strongprime.c
index a5f6052..866533d 100644 (file)
--- a/strongprime.c
+++ b/strongprime.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: strongprime.c,v 1.2 2000/02/12 18:21:03 mdw Exp $
+ * $Id: strongprime.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Generate `strong' prime numbers
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,29 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: strongprime.c,v $
- * Revision 1.2  2000/02/12 18:21:03  mdw
- * Overhaul of key management (again).
- *
- * Revision 1.1  1999/12/22 15:51:22  mdw
- * Find `strong' RSA primes using Gordon's algorithm.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <mLib/dstr.h>
@@ -95,22 +84,21 @@ mp *strongprime_setup(const char *name, mp *d, pfilt *f, unsigned nbits,
 
   /* --- Choose two primes %$s$% and %$t$% of half the required size --- */
 
+  assert(((void)"nbits too small in strongprime_setup", nbits/2 > BITSLOP));
   nbits = nbits/2 - BITSLOP;
   c.step = 1;
 
   rr = mprand(rr, nbits, r, 1);
   DRESET(&dn); dstr_putf(&dn, "%s [s]", name);
-  if ((s = pgen(dn.buf, MP_NEW, rr, event, ectx, n, pgen_filter, &c,
+  if ((s = pgen(dn.buf, MP_NEWSEC, rr, event, ectx, n, pgen_filter, &c,
           rabin_iters(nbits), pgen_test, &rb)) == 0)
     goto fail_s;
-  mp_burn(s);
 
   rr = mprand(rr, nbits, r, 1);
   DRESET(&dn); dstr_putf(&dn, "%s [t]", name);
-  if ((t = pgen(dn.buf, MP_NEW, rr, event, ectx, n, pgen_filter, &c,
+  if ((t = pgen(dn.buf, MP_NEWSEC, rr, event, ectx, n, pgen_filter, &c,
                rabin_iters(nbits), pgen_test, &rb)) == 0)
     goto fail_t;
-  mp_burn(t);
 
   /* --- Choose a suitable value for %$r = 2it + 1$% for some %$i$% --- */
 
@@ -158,12 +146,6 @@ mp *strongprime_setup(const char *name, mp *d, pfilt *f, unsigned nbits,
 
   /* --- Return the result --- */
 
-#if 0
-fputs("r = ", stdout); mp_writefile(q, stdout, 10); putchar('\n');
-fputs("s = ", stdout); mp_writefile(s, stdout, 10); putchar('\n');
-fputs("t = ", stdout); mp_writefile(t, stdout, 10); putchar('\n');
-#endif
-
   mp_drop(q);
   mp_drop(t);
   mp_drop(s);
@@ -212,7 +194,7 @@ mp *strongprime(const char *name, mp *d, unsigned nbits, grand *r,
   pfilt f;
   pgen_jumpctx j;
   rabin rb;
-  
+
   d = strongprime_setup(name, d, &f, nbits, r, n, event, ectx);
   j.j = &f;
   d = pgen(name, d, d, event, ectx, n, pgen_jump, &j,