prime generation: Deploy the new Baillie--PSW testers.

[catacomb] / pub / dh-kcdsa.c

diff --git a/pub/dh-kcdsa.c b/pub/dh-kcdsa.c
index d27bc7d..d156740 100644 (file)
--- a/pub/dh-kcdsa.c
+++ b/pub/dh-kcdsa.c
@@ -63,7 +63,6 @@ int dh_kcdsagen(dh_param *dp, unsigned ql, unsigned pl,
   pgen_simulprime sp[2];
   pgen_simulctx ss;
   prim_ctx pc;
-  rabin rb;
   int rc = PGEN_ABORT;
   int i;
   mp *x = MP_NEW, *t = MP_NEW;
@@ -75,7 +74,7 @@ retry:
   x = mprand(x, pl - ql - 1, r, 1);
   x = pgen("v", x, x, ev, ec,
           steps, pgen_filter, &pf,
-          rabin_iters(pl - ql), pgen_test, &rb);
+          PGEN_BAILLIEPSWNTESTS, pgen_bailliepswtest, 0);
   if (!x)
     goto fail_0;
 
@@ -91,7 +90,7 @@ retry:
   } while (mp_bits(t) != pl);
   dp->q = pgen("p", MP_NEW, x, ev, ec,
               steps, pgen_simulstep, &ss,
-              rabin_iters(ql), pgen_simultest, &ss);
+              PGEN_BAILLIEPSWNTESTS, pgen_simulbailliepswtest, &ss);
   mp_drop(sp[1].mul);
   dp->p = sp[1].u.x;
   if (!dp->q)