In perl.git, the branch blead has been updated
<https://perl5.git.perl.org/perl.git/commitdiff/a85aec40e61a21ebd6e61fb1b82b3910e9f951db?hp=5a736967cf2e79570d400232dbe0c1915cc64d07>
- Log -----------------------------------------------------------------
commit a85aec40e61a21ebd6e61fb1b82b3910e9f951db
Author: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk>
Date: Mon Dec 18 13:31:43 2017 +0000
Customisations for Digest-SHA tests
commit 99324e305b608b891d48b7a583cd9bb16a4d0a7c
Author: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk>
Date: Mon Dec 18 13:15:34 2017 +0000
Update Digest-SHA to CPAN version 6.00
[DELTA]
6.00 Fri Dec 8 22:44:44 MST 2017
- added "tag" option (BSD-style checksums) to shasum
-- consistent with GNU sha1sum, sha224sum, etc.
-- thanks to Christopher Tubbs for suggestion
- modified SHA.pm to use XSLoader
-- falls back to DynaLoader if necessary
- decoupled Digest::SHA and Digest::SHA::PurePerl
-- scripts/tests in each module now fully independent
-- Digest::SHA::PurePerl to be phased out eventually
-- past versions will remain available
-----------------------------------------------------------------------
Summary of changes:
Porting/Maintainers.pl | 28 ++++++++++++++++++++++-
cpan/Digest-SHA/SHA.xs | 2 +-
cpan/Digest-SHA/lib/Digest/SHA.pm | 17 ++++++++++----
cpan/Digest-SHA/shasum | 48 +++++++++++++++++++++++++++------------
cpan/Digest-SHA/src/sha.c | 4 ++--
cpan/Digest-SHA/src/sha.h | 4 ++--
cpan/Digest-SHA/src/sha64bit.c | 4 ++--
cpan/Digest-SHA/src/sha64bit.h | 4 ++--
cpan/Digest-SHA/t/allfcns.t | 36 +++++++++--------------------
cpan/Digest-SHA/t/base64.t | 18 ++-------------
cpan/Digest-SHA/t/bitbuf.t | 22 ++++--------------
cpan/Digest-SHA/t/bitorder.t | 35 ++++++++++------------------
cpan/Digest-SHA/t/fips180-4.t | 17 +-------------
cpan/Digest-SHA/t/fips198.t | 16 +------------
cpan/Digest-SHA/t/gg.t | 18 ++-------------
cpan/Digest-SHA/t/gglong.t | 20 +++-------------
cpan/Digest-SHA/t/hmacsha.t | 16 +------------
cpan/Digest-SHA/t/inheritance.t | 18 ++-------------
cpan/Digest-SHA/t/ireland.t | 22 ++++--------------
cpan/Digest-SHA/t/methods.t | 22 ++++--------------
cpan/Digest-SHA/t/nistbit.t | 18 ++-------------
cpan/Digest-SHA/t/nistbyte.t | 18 ++-------------
cpan/Digest-SHA/t/rfc2202.t | 16 +------------
cpan/Digest-SHA/t/sha1.t | 17 +-------------
cpan/Digest-SHA/t/sha224.t | 17 +-------------
cpan/Digest-SHA/t/sha256.t | 17 +-------------
cpan/Digest-SHA/t/sha384.t | 17 +-------------
cpan/Digest-SHA/t/sha512.t | 17 +-------------
cpan/Digest-SHA/t/state.t | 18 ++-------------
cpan/Digest-SHA/t/unicode.t | 16 +------------
cpan/Digest-SHA/t/woodbury.t | 16 +------------
t/porting/customized.dat | 23 +++++++++++++++++++
32 files changed, 166 insertions(+), 415 deletions(-)
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index b662ea8788..c72233c3d5 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -377,7 +377,7 @@ use File::Glob qw(:case);
},
'Digest::SHA' => {
- 'DISTRIBUTION' => 'MSHELOR/Digest-SHA-5.98.tar.gz',
+ 'DISTRIBUTION' => 'MSHELOR/Digest-SHA-6.00.tar.gz',
'FILES' => q[cpan/Digest-SHA],
'EXCLUDED' => [
qw( t/pod.t
@@ -385,6 +385,32 @@ use File::Glob qw(:case);
examples/dups
),
],
+ # https://rt.cpan.org/Public/Bug/Display.html?id=123863
+ CUSTOMIZED => [qw[
+ t/allfcns.t
+ t/base64.t
+ t/bitbuf.t
+ t/bitorder.t
+ t/fips180-4.t
+ t/fips198.t
+ t/gg.t
+ t/gglong.t
+ t/hmacsha.t
+ t/inheritance.t
+ t/ireland.t
+ t/methods.t
+ t/nistbit.t
+ t/nistbyte.t
+ t/rfc2202.t
+ t/sha1.t
+ t/sha224.t
+ t/sha256.t
+ t/sha384.t
+ t/sha512.t
+ t/state.t
+ t/unicode.t
+ t/woodbury.t
+ ] ],
},
'Dumpvalue' => {
diff --git a/cpan/Digest-SHA/SHA.xs b/cpan/Digest-SHA/SHA.xs
index 0a0c89d4e3..62eaad8d53 100644
--- a/cpan/Digest-SHA/SHA.xs
+++ b/cpan/Digest-SHA/SHA.xs
@@ -401,6 +401,6 @@ PPCODE:
}
if (cr) {
in[0] = '\012';
- shawrite(in, 1 << 3, state);
+ shawrite(in, 1UL << 3, state);
}
XSRETURN(1);
diff --git a/cpan/Digest-SHA/lib/Digest/SHA.pm
b/cpan/Digest-SHA/lib/Digest/SHA.pm
index 6a60926067..53b3f06f5d 100644
--- a/cpan/Digest-SHA/lib/Digest/SHA.pm
+++ b/cpan/Digest-SHA/lib/Digest/SHA.pm
@@ -8,11 +8,10 @@ use vars qw($VERSION @ISA @EXPORT_OK);
use Fcntl qw(O_RDONLY);
use integer;
-$VERSION = '5.98';
+$VERSION = '6.00';
require Exporter;
-require DynaLoader;
-@ISA = qw(Exporter DynaLoader);
+@ISA = qw(Exporter);
@EXPORT_OK = qw(
hmac_sha1 hmac_sha1_base64 hmac_sha1_hex
hmac_sha224 hmac_sha224_base64 hmac_sha224_hex
@@ -124,7 +123,7 @@ sub addfile {
if ($BITS) {
my ($n, $buf) = (0, "");
while (($n = read(FH, $buf, 4096))) {
- $buf =~ s/[^01]//g;
+ $buf =~ tr/01//cd;
$self->add_bits($buf);
}
_bail("Read failed") unless defined $n;
@@ -236,7 +235,15 @@ sub load {
$class->putstate($str);
}
-Digest::SHA->bootstrap($VERSION);
+eval {
+ require XSLoader;
+ XSLoader::load('Digest::SHA', $VERSION);
+ 1;
+} or do {
+ require DynaLoader;
+ push @ISA, 'DynaLoader';
+ Digest::SHA->bootstrap($VERSION);
+};
1;
__END__
diff --git a/cpan/Digest-SHA/shasum b/cpan/Digest-SHA/shasum
index 1b9bf6e6f9..25330ddd94 100644
--- a/cpan/Digest-SHA/shasum
+++ b/cpan/Digest-SHA/shasum
@@ -4,8 +4,8 @@
##
## Copyright (C) 2003-2017 Mark Shelor, All Rights Reserved
##
- ## Version: 5.98
- ## Wed Oct 4 00:40:02 MST 2017
+ ## Version: 6.00
+ ## Fri Dec 8 22:44:44 MST 2017
## shasum SYNOPSIS adapted from GNU Coreutils sha1sum. Add
## "-a" option for algorithm selection,
@@ -35,6 +35,7 @@ shasum - Print or Check SHA Checksums
-a, --algorithm 1 (default), 224, 256, 384, 512, 512224, 512256
-b, --binary read in binary mode
-c, --check read SHA sums from the FILEs and check them
+ --tag create a BSD-style checksum
-t, --text read in text mode (default)
-U, --UNIVERSAL read in Universal Newlines mode
produces same digest on Windows/Unix/Mac
@@ -104,7 +105,7 @@ I<shasum> is implemented using the Perl module
L<Digest::SHA>.
END_OF_POD
-my $VERSION = "5.98";
+my $VERSION = "6.00";
sub usage {
my($err, $msg) = @_;
@@ -132,7 +133,7 @@ select((select(STDERR), $| = 1)[0]);
## Collect options from command line
my ($alg, $binary, $check, $text, $status, $quiet, $warn, $help);
-my ($version, $BITS, $UNIVERSAL);
+my ($version, $BITS, $UNIVERSAL, $tag);
eval { Getopt::Long::Configure ("bundling") };
GetOptions(
@@ -143,6 +144,7 @@ GetOptions(
'h|help' => \$help, 'v|version' => \$version,
'0|01' => \$BITS,
'U|UNIVERSAL' => \$UNIVERSAL,
+ 'tag' => \$tag,
) or usage(1, "");
@@ -159,13 +161,23 @@ usage(1, "shasum: --status option used only when
verifying checksums\n")
if $status && !$check;
usage(1, "shasum: --quiet option used only when verifying checksums\n")
if $quiet && !$check;
+usage(1, "shasum: --tag does not support --text mode\n")
+ if $tag && $text;
+usage(1, "shasum: --tag does not support Universal Newlines mode\n")
+ if $tag && $UNIVERSAL;
+usage(1, "shasum: --tag does not support BITS mode\n")
+ if $tag && $BITS;
## Default to SHA-1 unless overridden by command line option
+my %isAlg = map { $_ => 1 } (1, 224, 256, 384, 512, 512224, 512256);
$alg = 1 unless defined $alg;
-grep { $_ == $alg } (1, 224, 256, 384, 512, 512224, 512256)
- or usage(1, "shasum: Unrecognized algorithm\n");
+usage(1, "shasum: Unrecognized algorithm\n") unless $isAlg{$alg};
+
+my %Tag = map { $_ => "SHA$_" } (1, 224, 256, 384, 512);
+$Tag{512224} = "SHA512/224";
+$Tag{512256} = "SHA512/256";
## Display version information if requested
@@ -237,13 +249,21 @@ sub verify {
or die "shasum: $checkfile: $!\n";
while (<FH>) {
next if /^#/; $num_lines++;
- ($bslash, $sum, $modesym, $fname) =
+ if (/^[ \t]*\\?SHA/) {
+ $modesym = '*';
+ ($bslash, $alg, $fname, $sum) =
+ /^[ \t]*(\\?)SHA(\S+) \((.+)\) = ([\da-fA-F]+)/;
+ $alg =~ tr{/}{}d if defined $alg;
+ }
+ else {
+ ($bslash, $sum, $modesym, $fname) =
/^[ \t]*(\\?)([\da-fA-F]+)[ \t]([ *^U])(.+)/;
- $alg = defined $sum ? $len2alg{length($sum)} : undef;
- if (grep { ! defined $_ } ($alg, $sum, $modesym, $fname)) {
- $alg = 1 unless defined $alg;
+ $alg = defined $sum ? $len2alg{length($sum)} : undef;
+ }
+ if (grep { ! defined $_ } ($alg, $sum, $modesym, $fname) or
+ ! $isAlg{$alg}) {
warn("shasum: $checkfile: $.: improperly " .
- "formatted SHA$alg checksum line\n") if $warn;
+ "formatted SHA checksum line\n") if $warn;
$fmt_errs++;
next;
}
@@ -284,16 +304,16 @@ sub verify {
## Verify or compute SHA checksums of requested files
my($file, $digest);
-
my $STATUS = 0;
for $file (@ARGV) {
if ($check) { $STATUS = 1 unless verify($file) }
elsif ($digest = sumfile($file)) {
if ($file =~ /[\n\\]/) {
$file =~ s/\\/\\\\/g; $file =~ s/\n/\\n/g;
- $digest = "\\$digest";
+ print "\\";
}
- print "$digest $modesym", "$file\n";
+ unless ($tag) { print "$digest $modesym$file\n" }
+ else { print "$Tag{$alg} ($file) = $digest\n" }
}
else { $STATUS = 1 }
}
diff --git a/cpan/Digest-SHA/src/sha.c b/cpan/Digest-SHA/src/sha.c
index c1f7407fb4..ee1b4d82c6 100644
--- a/cpan/Digest-SHA/src/sha.c
+++ b/cpan/Digest-SHA/src/sha.c
@@ -5,8 +5,8 @@
*
* Copyright (C) 2003-2017 Mark Shelor, All Rights Reserved
*
- * Version: 5.98
- * Wed Oct 4 00:40:02 MST 2017
+ * Version: 6.00
+ * Fri Dec 8 22:44:44 MST 2017
*
*/
diff --git a/cpan/Digest-SHA/src/sha.h b/cpan/Digest-SHA/src/sha.h
index afb6af5024..3347e9192c 100644
--- a/cpan/Digest-SHA/src/sha.h
+++ b/cpan/Digest-SHA/src/sha.h
@@ -5,8 +5,8 @@
*
* Copyright (C) 2003-2017 Mark Shelor, All Rights Reserved
*
- * Version: 5.98
- * Wed Oct 4 00:40:02 MST 2017
+ * Version: 6.00
+ * Fri Dec 8 22:44:44 MST 2017
*
*/
diff --git a/cpan/Digest-SHA/src/sha64bit.c b/cpan/Digest-SHA/src/sha64bit.c
index f9693d27d2..988a04ccf0 100644
--- a/cpan/Digest-SHA/src/sha64bit.c
+++ b/cpan/Digest-SHA/src/sha64bit.c
@@ -5,8 +5,8 @@
*
* Copyright (C) 2003-2017 Mark Shelor, All Rights Reserved
*
- * Version: 5.98
- * Wed Oct 4 00:40:02 MST 2017
+ * Version: 6.00
+ * Fri Dec 8 22:44:44 MST 2017
*
*/
diff --git a/cpan/Digest-SHA/src/sha64bit.h b/cpan/Digest-SHA/src/sha64bit.h
index f6f89592f8..f57d03cf0d 100644
--- a/cpan/Digest-SHA/src/sha64bit.h
+++ b/cpan/Digest-SHA/src/sha64bit.h
@@ -5,8 +5,8 @@
*
* Copyright (C) 2003-2017 Mark Shelor, All Rights Reserved
*
- * Version: 5.98
- * Wed Oct 4 00:40:02 MST 2017
+ * Version: 6.00
+ * Fri Dec 8 22:44:44 MST 2017
*
* The following macros supply placeholder values that enable the
* sha.c module to successfully compile when 64-bit integer types
diff --git a/cpan/Digest-SHA/t/allfcns.t b/cpan/Digest-SHA/t/allfcns.t
index 9f2a9ba534..c2de21cce2 100644
--- a/cpan/Digest-SHA/t/allfcns.t
+++ b/cpan/Digest-SHA/t/allfcns.t
@@ -1,29 +1,15 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(
- hmac_sha1 hmac_sha1_base64 hmac_sha1_hex
- hmac_sha224 hmac_sha224_base64 hmac_sha224_hex
- hmac_sha256 hmac_sha256_base64 hmac_sha256_hex
- hmac_sha384 hmac_sha384_base64 hmac_sha384_hex
- hmac_sha512 hmac_sha512_base64 hmac_sha512_hex
- sha1 sha1_base64 sha1_hex
- sha224 sha224_base64 sha224_hex
- sha256 sha256_base64 sha256_hex
- sha384 sha384_base64 sha384_hex
- sha512 sha512_base64 sha512_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(
+ hmac_sha1 hmac_sha1_base64 hmac_sha1_hex
+ hmac_sha224 hmac_sha224_base64 hmac_sha224_hex
+ hmac_sha256 hmac_sha256_base64 hmac_sha256_hex
+ hmac_sha384 hmac_sha384_base64 hmac_sha384_hex
+ hmac_sha512 hmac_sha512_base64 hmac_sha512_hex
+ sha1 sha1_base64 sha1_hex
+ sha224 sha224_base64 sha224_hex
+ sha256 sha256_base64 sha256_hex
+ sha384 sha384_base64 sha384_hex
+ sha512 sha512_base64 sha512_hex);
print "1..1\n";
diff --git a/cpan/Digest-SHA/t/base64.t b/cpan/Digest-SHA/t/base64.t
index 2cafdbd8de..6ebba00f3b 100644
--- a/cpan/Digest-SHA/t/base64.t
+++ b/cpan/Digest-SHA/t/base64.t
@@ -1,20 +1,6 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha1_base64 sha224_base64 sha256_base64
- sha384_base64 sha512_base64));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha1_base64 sha224_base64 sha256_base64
+ sha384_base64 sha512_base64);
my $in = "abc";
my @out = map { eval } <DATA>;
diff --git a/cpan/Digest-SHA/t/bitbuf.t b/cpan/Digest-SHA/t/bitbuf.t
index 78b499baba..4cf4032d98 100644
--- a/cpan/Digest-SHA/t/bitbuf.t
+++ b/cpan/Digest-SHA/t/bitbuf.t
@@ -1,19 +1,5 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw());
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA;
my $numtests = 4;
print "1..$numtests\n";
@@ -23,7 +9,7 @@ print "1..$numtests\n";
my $ONEBITS = pack("B*", "1" x 80000);
my $digest = "11003389959355c2773af6b0f36d842fe430ec49";
-my $state = $MODULE->new("sHa1");
+my $state = Digest::SHA->new("sHa1");
my $testnum = 1;
$state->add_bits($ONEBITS, 80000);
@@ -44,7 +30,7 @@ print "ok ", $testnum++, "\n";
# create a buffer-alignment nuisance
-$state = $MODULE->new("1");
+$state = Digest::SHA->new("1");
$state->add_bits($ONEBITS, 1);
for (1 .. 99) {
@@ -60,7 +46,7 @@ print "ok ", $testnum++, "\n";
my $reps = 80000;
my $maxbits = 8 * 127;
-$state = $MODULE->new(1);
+$state = Digest::SHA->new(1);
while ($reps > $maxbits) {
my $num = int(rand($maxbits));
diff --git a/cpan/Digest-SHA/t/bitorder.t b/cpan/Digest-SHA/t/bitorder.t
index 2cd2dbf56b..750f3b5a26 100644
--- a/cpan/Digest-SHA/t/bitorder.t
+++ b/cpan/Digest-SHA/t/bitorder.t
@@ -1,29 +1,18 @@
use strict;
+use Digest::SHA;
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw());
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+my $numtests = 2;
+print "1..$numtests\n";
-my $s1 = $MODULE->new;
-my $s2 = $MODULE->new;
+my $testnum = 1;
+my $s1 = Digest::SHA->new;
+my $s2 = Digest::SHA->new;
my $d1 = $s1->add_bits("110")->hexdigest;
my $d2 = $s2->add_bits("1")->add_bits("1")->add_bits("0")->hexdigest;
+print "not " unless $d1 eq $d2;
+print "ok ", $testnum++, "\n";
-my $numtests = 1;
-print "1..$numtests\n";
-
-for (1 .. $numtests) {
- print "not " unless $d1 eq $d2;
- print "ok ", $_, "\n";
-}
+$d1 = $s1->add_bits("111100001010")->hexdigest;
+$d2 = $s2->add_bits("\xF0\xA0", 12)->hexdigest;
+print "not " unless $d1 eq $d2;
+print "ok ", $testnum++, "\n";
diff --git a/cpan/Digest-SHA/t/fips180-4.t b/cpan/Digest-SHA/t/fips180-4.t
index 78feb8d6c8..161a9346f2 100644
--- a/cpan/Digest-SHA/t/fips180-4.t
+++ b/cpan/Digest-SHA/t/fips180-4.t
@@ -1,22 +1,7 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha512_hex sha512224_hex sha512256_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha512_hex sha512224_hex sha512256_hex);
my @vecs = map { eval } <DATA>;
-# $#vecs -= 2 if $MODULE eq "Digest::SHA::PurePerl";
my $numtests = scalar(@vecs) / 2;
print "1..$numtests\n";
diff --git a/cpan/Digest-SHA/t/fips198.t b/cpan/Digest-SHA/t/fips198.t
index f6f5007f5f..da0c15667c 100644
--- a/cpan/Digest-SHA/t/fips198.t
+++ b/cpan/Digest-SHA/t/fips198.t
@@ -1,19 +1,5 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(hmac_sha1_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(hmac_sha1_hex);
my @data = map { "Sample #$_" } (1 .. 4);
diff --git a/cpan/Digest-SHA/t/gg.t b/cpan/Digest-SHA/t/gg.t
index 6ca8f7fb9c..af0f5d6fa7 100644
--- a/cpan/Digest-SHA/t/gg.t
+++ b/cpan/Digest-SHA/t/gg.t
@@ -1,21 +1,7 @@
# Test against short bitwise vectors from Jim Gillogly and Francois Grieu
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw());
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA;
# SHA-1 Test Vectors
#
@@ -57,7 +43,7 @@ my $numtests = scalar(@vecs) / 4;
print "1..$numtests\n";
my $testnum = 1;
-my $sha = $MODULE->new(1);
+my $sha = Digest::SHA->new(1);
while (@vecs) {
my $frag = shift @vecs;
diff --git a/cpan/Digest-SHA/t/gglong.t b/cpan/Digest-SHA/t/gglong.t
index 044799f69e..5551eefff8 100644
--- a/cpan/Digest-SHA/t/gglong.t
+++ b/cpan/Digest-SHA/t/gglong.t
@@ -1,21 +1,7 @@
# Test against long bitwise vectors from Jim Gillogly and Francois Grieu
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw());
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA;
# SHA-1 Test Vectors
#
@@ -57,7 +43,7 @@ for (1 .. 8) { my $line = <DATA>; $STATE011 .= $line }
my $testnum = 1;
print "1..", scalar(@vec110)/2 + scalar(@vec011)/2, "\n";
-my $state110 = $MODULE->putstate($STATE110);
+my $state110 = Digest::SHA->putstate($STATE110);
while (@vec110) {
my $state = $state110->clone;
$state->add_bits(shift @vec110);
@@ -65,7 +51,7 @@ while (@vec110) {
print "ok ", $testnum++, "\n";
}
-my $state011 = $MODULE->putstate($STATE011);
+my $state011 = Digest::SHA->putstate($STATE011);
while (@vec011) {
my $state = $state011->clone;
$state->add_bits(shift @vec011);
diff --git a/cpan/Digest-SHA/t/hmacsha.t b/cpan/Digest-SHA/t/hmacsha.t
index 47e65fefbe..a4e6f5cb98 100644
--- a/cpan/Digest-SHA/t/hmacsha.t
+++ b/cpan/Digest-SHA/t/hmacsha.t
@@ -1,21 +1,7 @@
# HMAC-SHA-256 test vectors from draft-ietf-ipsec-ciph-sha-256-01.txt
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(hmac_sha256 hmac_sha256_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(hmac_sha256 hmac_sha256_hex);
my @data = map { eval } <DATA>;
diff --git a/cpan/Digest-SHA/t/inheritance.t b/cpan/Digest-SHA/t/inheritance.t
index d94c23ae1a..5880e6e8dd 100644
--- a/cpan/Digest-SHA/t/inheritance.t
+++ b/cpan/Digest-SHA/t/inheritance.t
@@ -1,25 +1,11 @@
# Adapted from script by Mark Lawrence (ref. rt.cpan.org #94830)
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha1));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha1);
package P1;
use vars qw(@ISA);
-@ISA = ($MODULE);
+@ISA = ("Digest::SHA");
package main;
diff --git a/cpan/Digest-SHA/t/ireland.t b/cpan/Digest-SHA/t/ireland.t
index 46499950f4..ef1ed3372b 100644
--- a/cpan/Digest-SHA/t/ireland.t
+++ b/cpan/Digest-SHA/t/ireland.t
@@ -1,31 +1,17 @@
-use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw());
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
-
# David Ireland's test vector - SHA-256 digest of "a" x 536870912
# Adapted from Julius Duque's original script (t/24-ireland.tmp)
# - modified to use state cache via putstate method
+use strict;
+use Digest::SHA;
+
print "1..1\n";
my $rsp = "b9045a713caed5dff3d3b783e98d1ce5778d8bc331ee4119d707072312af06a7";
my $sha;
-if ($sha = $MODULE->putstate(join('', <DATA>))) {
+if ($sha = Digest::SHA->putstate(join('', <DATA>))) {
$sha->add("aa");
print "not " unless $sha->hexdigest eq $rsp;
print "ok 1\n";
diff --git a/cpan/Digest-SHA/t/methods.t b/cpan/Digest-SHA/t/methods.t
index a9096d926b..1522f99bc3 100644
--- a/cpan/Digest-SHA/t/methods.t
+++ b/cpan/Digest-SHA/t/methods.t
@@ -1,20 +1,6 @@
use strict;
use FileHandle;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw());
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA;
my @out = (
"ungWv48Bz+pBQUDeXa4iI7ADYaOWF3qctBD/YfIAFa0",
@@ -28,11 +14,11 @@ print "1..$numtests\n";
my $testnum = 1;
my $NSA = "SHA-42"; # No Such Algorithm
-print "not " if $MODULE->new($NSA);
+print "not " if Digest::SHA->new($NSA);
print "ok ", $testnum++, "\n";
my $tempfile = "methods.tmp";
-END { 1 while unlink $tempfile }
+END { unlink $tempfile if $tempfile }
# test OO methods using first two SHA-256 vectors from NIST
@@ -41,7 +27,7 @@ binmode($fh);
print $fh "bcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
$fh->close;
-my $sha = $MODULE->new()->reset("SHA-256")->new();
+my $sha = Digest::SHA->new()->reset("SHA-256")->new();
$sha->add_bits("a", 5)->add_bits("001");
my $rsp = shift(@out);
diff --git a/cpan/Digest-SHA/t/nistbit.t b/cpan/Digest-SHA/t/nistbit.t
index 91dc2804d9..eef1271cc7 100644
--- a/cpan/Digest-SHA/t/nistbit.t
+++ b/cpan/Digest-SHA/t/nistbit.t
@@ -1,21 +1,7 @@
# Test against SHA-1 Sample Vectors from NIST
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw());
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA;
my $nist_hashes = <<END_OF_NIST_HASHES;
DA39A3EE5E6B4B0D3255BFEF95601890AFD80709 ^
@@ -51,7 +37,7 @@ print "1..", scalar(@hashes), "\n";
my $testnum = 1;
my $message = "";
-my $sha = $MODULE->new(1);
+my $sha = Digest::SHA->new(1);
for (@lines) {
next unless /^[\d ^]/;
$message .= $_;
diff --git a/cpan/Digest-SHA/t/nistbyte.t b/cpan/Digest-SHA/t/nistbyte.t
index ce133d6467..1bdafa6beb 100644
--- a/cpan/Digest-SHA/t/nistbyte.t
+++ b/cpan/Digest-SHA/t/nistbyte.t
@@ -1,21 +1,7 @@
# Test against SHA-1 Sample Vectors from NIST
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw());
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA;
my $nist_hashes = <<END_OF_NIST_HASHES;
DA39A3EE5E6B4B0D3255BFEF95601890AFD80709 ^
@@ -51,7 +37,7 @@ print "1..", scalar(@hashes), "\n";
my $testnum = 1;
my $message = "";
-my $sha = $MODULE->new(1);
+my $sha = Digest::SHA->new(1);
for (@lines) {
next unless /^[\d ^]/;
$message .= $_;
diff --git a/cpan/Digest-SHA/t/rfc2202.t b/cpan/Digest-SHA/t/rfc2202.t
index 3efb50b5a5..3006625030 100644
--- a/cpan/Digest-SHA/t/rfc2202.t
+++ b/cpan/Digest-SHA/t/rfc2202.t
@@ -1,19 +1,5 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(hmac_sha1_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(hmac_sha1_hex);
my @data = map { eval } <DATA>;
diff --git a/cpan/Digest-SHA/t/sha1.t b/cpan/Digest-SHA/t/sha1.t
index ed2c68edcf..2c8313dc0a 100644
--- a/cpan/Digest-SHA/t/sha1.t
+++ b/cpan/Digest-SHA/t/sha1.t
@@ -1,22 +1,7 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha1_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha1_hex);
my @vecs = map { eval } <DATA>;
-$#vecs -= 2 if $MODULE eq "Digest::SHA::PurePerl";
my $numtests = scalar(@vecs) / 2;
print "1..$numtests\n";
diff --git a/cpan/Digest-SHA/t/sha224.t b/cpan/Digest-SHA/t/sha224.t
index e94820d485..ab70b31e6a 100644
--- a/cpan/Digest-SHA/t/sha224.t
+++ b/cpan/Digest-SHA/t/sha224.t
@@ -1,22 +1,7 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha224_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha224_hex);
my @vecs = map { eval } <DATA>;
-$#vecs -= 2 if $MODULE eq "Digest::SHA::PurePerl";
my $numtests = scalar(@vecs) / 2;
print "1..$numtests\n";
diff --git a/cpan/Digest-SHA/t/sha256.t b/cpan/Digest-SHA/t/sha256.t
index 78aeb9dc3d..72c1e8d593 100644
--- a/cpan/Digest-SHA/t/sha256.t
+++ b/cpan/Digest-SHA/t/sha256.t
@@ -1,22 +1,7 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha256_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha256_hex);
my @vecs = map { eval } <DATA>;
-$#vecs -= 2 if $MODULE eq "Digest::SHA::PurePerl";
my $numtests = scalar(@vecs) / 2;
print "1..$numtests\n";
diff --git a/cpan/Digest-SHA/t/sha384.t b/cpan/Digest-SHA/t/sha384.t
index 9d026ae1ff..273944920e 100644
--- a/cpan/Digest-SHA/t/sha384.t
+++ b/cpan/Digest-SHA/t/sha384.t
@@ -1,22 +1,7 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha384_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha384_hex);
my @vecs = map { eval } <DATA>;
-$#vecs -= 2 if $MODULE eq "Digest::SHA::PurePerl";
my $numtests = scalar(@vecs) / 2;
print "1..$numtests\n";
diff --git a/cpan/Digest-SHA/t/sha512.t b/cpan/Digest-SHA/t/sha512.t
index fcfe766961..d417f6649a 100644
--- a/cpan/Digest-SHA/t/sha512.t
+++ b/cpan/Digest-SHA/t/sha512.t
@@ -1,22 +1,7 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha512_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha512_hex);
my @vecs = map { eval } <DATA>;
-$#vecs -= 2 if $MODULE eq "Digest::SHA::PurePerl";
my $numtests = scalar(@vecs) / 2;
print "1..$numtests\n";
diff --git a/cpan/Digest-SHA/t/state.t b/cpan/Digest-SHA/t/state.t
index 83e2540818..ff622bac96 100644
--- a/cpan/Digest-SHA/t/state.t
+++ b/cpan/Digest-SHA/t/state.t
@@ -1,19 +1,5 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha384_hex sha512_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha384_hex sha512_hex);
my @sharsp = (
"34aa973cd4c4daa4f61eeb2bdbad27316534016f",
@@ -48,7 +34,7 @@ while (@sharsp) {
}
my $digest;
my $state;
- unless ($state = $MODULE->putstate(shift @states)) {
+ unless ($state = Digest::SHA->putstate(shift @states)) {
print "not ok ", $testnum++, "\n";
next;
}
diff --git a/cpan/Digest-SHA/t/unicode.t b/cpan/Digest-SHA/t/unicode.t
index 1e7bd13d53..9f0107a404 100644
--- a/cpan/Digest-SHA/t/unicode.t
+++ b/cpan/Digest-SHA/t/unicode.t
@@ -1,19 +1,5 @@
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(sha1_hex));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(sha1_hex);
my $skip = $] < 5.006 ? 1 : 0;
diff --git a/cpan/Digest-SHA/t/woodbury.t b/cpan/Digest-SHA/t/woodbury.t
index afcb731962..95527006cd 100644
--- a/cpan/Digest-SHA/t/woodbury.t
+++ b/cpan/Digest-SHA/t/woodbury.t
@@ -3,21 +3,7 @@
# Vectors and initial script courtesy of Adam Woodbury, The MITRE Corporation
use strict;
-
-my $MODULE;
-
-BEGIN {
- $MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
- eval "require $MODULE" || die $@;
- $MODULE->import(qw(hmac_sha256 hmac_sha384 hmac_sha512));
-}
-
-BEGIN {
- if ($ENV{PERL_CORE}) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
+use Digest::SHA qw(hmac_sha256 hmac_sha384 hmac_sha512);
my @plex = map { eval } <DATA>;
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 9c9b00ddad..2efe884583 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -3,6 +3,29 @@
# ./perl -I../lib porting/customized.t --regen
Devel::PPPort dist/Devel-PPPort/parts/embed.fnc
e030719d9c6921810554a8e2d398543348b4878c
Digest cpan/Digest/Digest.pm 43f7f544cb11842b2f55c73e28930da50774e081
+Digest::SHA cpan/Digest-SHA/t/allfcns.t
9ee294dc3f6a1c6b6c8e9bf7e17a3100ab7f98e3
+Digest::SHA cpan/Digest-SHA/t/base64.t 092e88b25f56ae01dce42c3c073603c648ba8f55
+Digest::SHA cpan/Digest-SHA/t/bitbuf.t 2bbc0d301391affadba59152ca6c85c0e0900f09
+Digest::SHA cpan/Digest-SHA/t/bitorder.t
e46044e2915895044933579f11c4801341ab1fdc
+Digest::SHA cpan/Digest-SHA/t/fips180-4.t
9cd39dfedb5905a5693c9e97e00070db072a471e
+Digest::SHA cpan/Digest-SHA/t/fips198.t
1482029f8f7dd4f000bbb34e9cbc09e1b3ae0893
+Digest::SHA cpan/Digest-SHA/t/gg.t e3bfaf58efb1dcc5aa7e26a889b600213c766c00
+Digest::SHA cpan/Digest-SHA/t/gglong.t 0ce33514b02891957fef68de2909b642cc06868f
+Digest::SHA cpan/Digest-SHA/t/hmacsha.t
d5f3f5ea89d63c4586fb7a22bbbf9e536e4fff99
+Digest::SHA cpan/Digest-SHA/t/inheritance.t
0b5953e9a2ef4aa9a1d6c09a828e806c5d39aa85
+Digest::SHA cpan/Digest-SHA/t/ireland.t
7c2c84aa8894022dc538b5d6dc86640d8ba75f4b
+Digest::SHA cpan/Digest-SHA/t/methods.t
85ab0c185c3a0444ab68ea41178f4c169624f7c3
+Digest::SHA cpan/Digest-SHA/t/nistbit.t
345a5a54b853b8633eec5e73190322c0856506d6
+Digest::SHA cpan/Digest-SHA/t/nistbyte.t
b12f6c887888bb7454ad09fba2c191467b4c001c
+Digest::SHA cpan/Digest-SHA/t/rfc2202.t
521a1ab31f8ed2072d4d358c09670c016add1b99
+Digest::SHA cpan/Digest-SHA/t/sha1.t 608824b77e2a47ef8357d4b72ccc05990f89dc98
+Digest::SHA cpan/Digest-SHA/t/sha224.t 0b690d62c1b13610c57e87fe5d1c42d3919968dc
+Digest::SHA cpan/Digest-SHA/t/sha256.t 8219d5d2c1561114f063eeba42ca2738637b3f5c
+Digest::SHA cpan/Digest-SHA/t/sha384.t c21cd7de72060eb6f9ae4d9c30ae8d13d0a0b856
+Digest::SHA cpan/Digest-SHA/t/sha512.t bbe44c7cb600c29ef6763d0782b0aae0269ba5f3
+Digest::SHA cpan/Digest-SHA/t/state.t b7146b91d9dcc276c4e3c0c251794bf5f46c1dfa
+Digest::SHA cpan/Digest-SHA/t/unicode.t
f62768510104cde42af8544e04af722ee2cbb85e
+Digest::SHA cpan/Digest-SHA/t/woodbury.t
1efec6fae3600f891d27f944d05d6e363444d9c8
Locale::Maketext::Simple
cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
57ed38905791a17c150210cd6f42ead22a7707b6
Math::Complex cpan/Math-Complex/lib/Math/Complex.pm
198ea6c6c584f5ea79a0fd7e9d411d0878f3b2af
Math::Complex cpan/Math-Complex/t/Complex.t
4f307ed6fc59f1e5fb0e6b11103fc631b6bdb335
--
Perl5 Master Repository
