[libmath-prime-util-perl] 23/40: fixup AES Lucas test

[Partha P. Mukherjee]

This is an automated email from the git hooks/post-receive script.

ppm-guest pushed a commit to annotated tag v0.30
in repository libmath-prime-util-perl.

commit d0d1afa96e5c5d9477557bb4df63bd6a84fa3e43
Author: Dana Jacobsen <dana at acm.org>
Date:   Fri Jul 12 17:02:35 2013 -0700

    fixup AES Lucas test
---
 factor.c               |  5 +++++
 lib/Math/Prime/Util.pm | 13 +++++++++----
 t/17-pseudoprime.t     | 16 +++++++++++-----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/factor.c b/factor.c
index b83da1a..146bfeb 100644
--- a/factor.c
+++ b/factor.c
@@ -629,6 +629,8 @@ int _XS_is_almost_extra_strong_lucas_pseudoprime(UV n, UV increment)
   if (n == 2 || n == 3 || n == 5) return 1;
   if (n < 7 || (n%2) == 0) return 0;
   if (n == UV_MAX) return 0;
+  if (increment < 1 || increment > 256)
+    croak("Invalid lucas paramater increment: %"UVuf"\n", increment);
 
   P = 3;
   while (1) {
@@ -640,7 +642,10 @@ int _XS_is_almost_extra_strong_lucas_pseudoprime(UV n, UV increment)
       break;
     if (P == (3+20*increment) && is_perfect_square(n, 0)) return 0;
     P += increment;
+    if (P > 65535)
+      croak("lucas_extrastrong_params: P exceeded 65535");
   }
+  if (P >= n)  P %= n;   /* Never happens with increment < 4 */
 
   d = n+1;
   s = 0;
diff --git a/lib/Math/Prime/Util.pm b/lib/Math/Prime/Util.pm
index c8304be..4d30ed1 100644
--- a/lib/Math/Prime/Util.pm
+++ b/lib/Math/Prime/Util.pm
@@ -1634,14 +1634,19 @@ sub is_extra_strong_lucas_pseudoprime {
 }
 
 sub is_almost_extra_strong_lucas_pseudoprime {
-  my($n) = shift;
+  my($n, $inc) = @_;
   _validate_num($n) || _validate_positive_integer($n);
-  return _XS_is_almost_extra_strong_lucas_pseudoprime($n)
+  if (!defined $inc) {
+    $inc = 1;
+  } else {
+    _validate_positive_integer($inc, 1, 256);
+  }
+  return _XS_is_almost_extra_strong_lucas_pseudoprime($n, $inc)
     if ref($n) ne 'Math::BigInt' && $n <= $_XS_MAXVAL;
-  return Math::Prime::Util::GMP::is_almost_extra_strong_lucas_pseudoprime("$n")
+  return Math::Prime::Util::GMP::is_almost_extra_strong_lucas_pseudoprime("$n", $inc)
     if $_HAVE_GMP
     && defined &Math::Prime::Util::GMP::is_almost_extra_strong_lucas_pseudoprime;
-  return Math::Prime::Util::PP::is_almost_extra_strong_lucas_pseudoprime($n);
+  return Math::Prime::Util::PP::is_almost_extra_strong_lucas_pseudoprime($n, $inc);
 }
 
 sub is_frobenius_underwood_pseudoprime {
diff --git a/t/17-pseudoprime.t b/t/17-pseudoprime.t
index 8d553e3..93dffe5 100644
--- a/t/17-pseudoprime.t
+++ b/t/17-pseudoprime.t
@@ -9,6 +9,7 @@ use Math::Prime::Util qw/is_prime
                          is_lucas_pseudoprime
                          is_strong_lucas_pseudoprime
                          is_extra_strong_lucas_pseudoprime
+                         is_almost_extra_strong_lucas_pseudoprime
                          is_frobenius_underwood_pseudoprime
                          lucas_sequence/;
 
@@ -68,7 +69,9 @@ my %pseudoprimes = (
  psp3       => [ qw/91 121 286 671 703 949 1105 1541 1729 1891 2465 2665 2701 2821 3281 3367 3751 4961 5551 6601 7381 8401 8911 10585 11011 12403 14383 15203 15457 15841 16471 16531 18721 19345 23521 24046 24661 24727 28009 29161/ ],
  lucas      => [ qw/323 377 1159 1829 3827 5459 5777 9071 9179 10877 11419 11663 13919 14839 16109 16211 18407 18971 19043/ ],
  slucas     => [ qw/5459 5777 10877 16109 18971 22499 24569 25199 40309 58519 75077 97439 100127 113573 115639 130139/ ],
- eslucas    => [ qw/989 3239 5777 10877 27971 29681 30739 31631 39059 72389 73919 75077 100127 113573 125249 137549 137801/ ],
+ eslucas    => [ qw/989 3239 5777 10877 27971 29681 30739 31631 39059 72389 73919 75077 100127 113573 125249 137549 137801 153931 155819/ ],
+ aeslucas1  => [ qw/989 3239 5777 10469 10877 27971 29681 30739 31631 39059 72389 73919 75077 100127 113573 125249 137549 137801 153931 154697 155819/ ],
+ aeslucas2  => [ qw/3239 4531 5777 10877 12209 21899 31631 31831 32129 34481 36079 37949 47849 50959 51641 62479 73919 75077 97109 100127 108679 113573 116899 154697 161027/ ],
 );
 my $num_pseudoprimes = 0;
 foreach my $ppref (values %pseudoprimes) {
@@ -117,15 +120,18 @@ is( is_strong_pseudoprime(3, 2), 1, "MR with 3 shortcut prime");
 # Check that each strong pseudoprime base b makes it through MR with that base
 while (my($base, $ppref) = each (%pseudoprimes)) {
   foreach my $p (@$ppref) {
-    if      ($base eq 'eslucas') {
+    if      ($base =~ /^psp(\d+)/) {
+      my $base = $1;
+      ok(is_pseudoprime($p, $base), "$p is a pseudoprime to base $base");
+    } elsif ($base =~ /^aeslucas(\d+)/) {
+      my $inc = $1;
+      ok(is_almost_extra_strong_lucas_pseudoprime($p,$inc), "$p is an almost extra strong Lucas pseudoprime (increment $inc)");
+    } elsif ($base eq 'eslucas') {
       ok(is_extra_strong_lucas_pseudoprime($p), "$p is an extra strong Lucas pseudoprime");
     } elsif ($base eq 'slucas') {
       ok(is_strong_lucas_pseudoprime($p), "$p is a strong Lucas-Selfridge pseudoprime");
     } elsif ($base eq 'lucas') {
       ok(is_lucas_pseudoprime($p), "$p is a Lucas-Selfridge pseudoprime");
-    } elsif ($base =~ /^psp(\d+)/) {
-      my $base = $1;
-      ok(is_pseudoprime($p, $base), "$p is a pseudoprime to base $base");
     } else {
       ok(is_strong_pseudoprime($p, $base), "Pseudoprime (base $base) $p passes MR");
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmath-prime-util-perl.git