Make output of "openssl dsaparam 1024" more interesting :-)

diff --git a/CHANGES b/CHANGES
index f706c10..1ea0ffb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -31,7 +31,9 @@
      division before starting the Rabin-Miller test and has
      an additional BN_CTX * argument (whereas BN_is_prime always
      has to allocate at least one BN_CTX).
      division before starting the Rabin-Miller test and has
      an additional BN_CTX * argument (whereas BN_is_prime always
      has to allocate at least one BN_CTX).

-     [Bodo Moeller]    
+     'callback(1, -1, cb_arg)' is called when a number has passed the
+     trial division stage.
+     [Bodo Moeller]

 
   *) Fix for bug in CRL encoding. The validity dates weren't being handled
      as ASN1_TIME.
 
   *) Fix for bug in CRL encoding. The validity dates weren't being handled
      as ASN1_TIME.

diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
index e679c7c..39b99ea 100644 (file)
--- a/crypto/bn/bn_prime.c
+++ b/crypto/bn/bn_prime.c
@@ -173,9 +173,12 @@ int BN_is_prime_fasttest(BIGNUM *a, int checks,
        if (!BN_is_odd(a))
                return(0);
        if (do_trial_division)
        if (!BN_is_odd(a))
                return(0);
        if (do_trial_division)

+               {

                for (i = 1; i < NUMPRIMES; i++)
                        if (BN_mod_word(a, primes[i]) == 0) 
                                return 0;
                for (i = 1; i < NUMPRIMES; i++)
                        if (BN_mod_word(a, primes[i]) == 0) 
                                return 0;

+               if (callback != NULL) callback(1,-1,cb_arg);
+               }

 
        if (ctx_passed != NULL)
                ctx=ctx_passed;
 
        if (ctx_passed != NULL)
                ctx=ctx_passed;

diff --git a/doc/crypto/DSA_generate_parameters.pod b/doc/crypto/DSA_generate_parameters.pod
index bae4e1b..04d8c9d 100644 (file)
--- a/doc/crypto/DSA_generate_parameters.pod
+++ b/doc/crypto/DSA_generate_parameters.pod
@@ -42,9 +42,11 @@ When a candidate for q is generated, B<callback(0, m++, cb_arg)> is called
 
 =item *
 
 
 =item *
 

-While a candidate for q is tested, B<callback(1, i, cb_arg)>
-is called in the outer loop of the Miller-Rabin primality tests
-(once for each witness that confirms that the candidate may be prime).
+When a candidate for q has passed a test by trial division,
+B<callback(1, -1, cb_arg)> is called.
+While a candidate for q is tested by Miller-Rabin primality tests,
+B<callback(1, i, cb_arg)> is called in the outer loop
+(once for each witness that confirms that the candidate may be prime);

 i is the loop counter (starting at 0).
 
 =item *
 i is the loop counter (starting at 0).
 
 =item *


@@ -59,8 +61,10 @@ B<callback(0, counter, cb_arg)> is called.
 
 =item *
 
 
 =item *
 

-While a candidate for p is tested, B<callback(1, j++, cb_arg)>
-is called in the outer loop of the Miller-Rabin primality test
+When a candidate for p has passed the test by trial division,
+B<callback(1, -1 , cb_arg)> is called.
+While it is tested by the Miller-Rabin primality test,
+B<callback(1, i, cb_arg)> is called in the outer loop

 (once for each witness that confirms that the candidate may be prime).
 i is the loop counter (starting at 0).
 
 (once for each witness that confirms that the candidate may be prime).
 i is the loop counter (starting at 0).