diff --git a/security/nss/lib/freebl/mpi/mpi.c b/security/nss/lib/freebl/mpi/mpi.c
index 0445430ad254..0296f5b60373 100644
--- a/security/nss/lib/freebl/mpi/mpi.c
+++ b/security/nss/lib/freebl/mpi/mpi.c
@@ -35,7 +35,7 @@
  * the GPL.  If you do not delete the provisions above, a recipient
  * may use your version of this file under either the MPL or the GPL.
  *
- *  $Id: mpi.c,v 1.19 2000/08/22 01:57:34 nelsonb%netscape.com Exp $
+ *  $Id: mpi.c,v 1.20 2000/08/23 01:20:13 nelsonb%netscape.com Exp $
  */
 
 #include "mpi-priv.h"
@@ -868,6 +868,7 @@ mp_err   mp_sqr(const mp_int *a, mp_int *sqr)
     a = &tmp;
   } else {
     DIGITS(&tmp) = 0;
+    res = MP_OKAY;
   }
 
   ix = 2 * MP_USED(a);
diff --git a/security/nss/lib/freebl/mpi/mpprime.c b/security/nss/lib/freebl/mpi/mpprime.c
index 4b75608e279c..e2e811dd7079 100644
--- a/security/nss/lib/freebl/mpi/mpprime.c
+++ b/security/nss/lib/freebl/mpi/mpprime.c
@@ -446,7 +446,8 @@ mp_err mpp_make_prime(mp_int *start, mp_size nBits, mp_size strong,
     num_tests = 9;
   } else if (nBits >= 256) {
     num_tests = 13;
-  }
+  } else
+    num_tests = 50;
 
   if (strong) 
     --nBits;