Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/catacomb

[u/mdw/catacomb] / rabin.c

diff --git a/rabin.c b/rabin.c
index 729ecce..1b1130b 100644 (file)
--- a/rabin.c
+++ b/rabin.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: rabin.c,v 1.9 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Miller-Rabin primality test
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * 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,
@@ -42,19 +42,23 @@
  * Arguments:  @rabin *r@ = pointer to Rabin-Miller context
  *             @mp *m@ = pointer to number to test
  *
- * Returns:    ---
+ * Returns:    Zero on success, nonzero on failure.
  *
  * Use:                Precomputes some useful values for performing the
  *             Miller-Rabin probabilistic primality test.
  */
 
-void rabin_create(rabin *r, mp *m)
+int rabin_create(rabin *r, mp *m)
 {
   mp *m1 = mp_sub(MP_NEW, m, MP_ONE);
-  mpmont_create(&r->mm, m);
+  if (mpmont_create(&r->mm, m)) {
+    MP_DROP(m1);
+    return (-1);
+  }
   r->r = mp_odd(MP_NEW, m1, &r->s);
   r->m1 = mp_sub(MP_NEW, m, r->mm.r);
   mp_drop(m1);
+  return (0);
 }
 
 /* --- @rabin_destroy@ --- *