Update Digest-SHA to CPAN version 5.48

  [DELTA]

  5.48  Mon Jan  4 16:32:52 MST 2010
        - fixed "shasum -a0" option (ref. rt.cpan.org #53319)
                -- incorrectly accepted 0 as a valid algorithm
                        -- thanks to Zefram for patch
        - updated URL for NIST test vectors
                -- ref. files t/nistbit.t, t/nistbyte.t
                        -- thanks to Leon Brocard for patch

29 files changed, 56 insertions, 53 deletions

diff --git a/cpan/Digest-SHA/Changes b/cpan/Digest-SHA/Changes
index ad5bd06b35..ec1b89eb14 100644
--- a/cpan/Digest-SHA/Changes
+++ b/cpan/Digest-SHA/Changes
@@ -1,5 +1,13 @@
 Revision history for Perl extension Digest::SHA.
 
+5.48  Mon Jan  4 16:32:52 MST 2010
+	- fixed "shasum -a0" option (ref. rt.cpan.org #53319)
+		-- incorrectly accepted 0 as a valid algorithm
+			-- thanks to Zefram for patch
+	- updated URL for NIST test vectors
+		-- ref. files t/nistbit.t, t/nistbyte.t
+			-- thanks to Leon Brocard for patch
+
 5.47  Wed Apr 30 04:00:54 MST 2008
 	- modified Makefile.PL to install in core for Perls >= 5.10
 		-- thanks to Jerry Hedden for patch
diff --git a/cpan/Digest-SHA/Makefile.PL b/cpan/Digest-SHA/Makefile.PL
index df63c2bfbf..ce9e4020b4 100644
--- a/cpan/Digest-SHA/Makefile.PL
+++ b/cpan/Digest-SHA/Makefile.PL
@@ -6,9 +6,6 @@ use Config;
 
 my $PM = 'lib/Digest/SHA.pm';
 
-my $PERL_CORE = 0;
-$PERL_CORE = 1 if grep { $_ eq 'PERL_CORE=1' } @ARGV;
-
 my %opts;
 getopts('tx', \%opts);
 
@@ -34,10 +31,8 @@ my %att = (
 	'LIBS'		=> [''],
 	'DEFINE'	=> $define,
 	'INC'		=> '-I.',
-	$PERL_CORE ? () : (
-	    'EXE_FILES'		=> [ 'shasum' ],
-	    'INSTALLDIRS'	=> ($] >= 5.010) ? 'perl' : 'site',
-	),
+	'EXE_FILES'	=> [ 'shasum' ],
+	'INSTALLDIRS'	=> ($] >= 5.010) ? 'perl' : 'site',
 );
 
 my $MMversion = $ExtUtils::MakeMaker::VERSION || 0;
diff --git a/cpan/Digest-SHA/README b/cpan/Digest-SHA/README
index 8cd68bd837..89aefc279e 100644
--- a/cpan/Digest-SHA/README
+++ b/cpan/Digest-SHA/README
@@ -1,4 +1,4 @@
-Digest::SHA version 5.47
+Digest::SHA version 5.48
 ========================
 
 Digest::SHA is a complete implementation of the NIST Secure Hash
@@ -34,7 +34,7 @@ DEPENDENCIES
 
 COPYRIGHT AND LICENSE
 
-Copyright (C) 2003-2008 Mark Shelor
+Copyright (C) 2003-2010 Mark Shelor
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/cpan/Digest-SHA/SHA.xs b/cpan/Digest-SHA/SHA.xs
index 7c394e98a8..233f1ac78a 100644
--- a/cpan/Digest-SHA/SHA.xs
+++ b/cpan/Digest-SHA/SHA.xs
@@ -8,7 +8,7 @@
 static int ix2alg[] =
 	{1,1,1,224,224,224,256,256,256,384,384,384,512,512,512};
 
-MODULE = Digest::SHA		PACKAGE = Digest::SHA		
+MODULE = Digest::SHA		PACKAGE = Digest::SHA
 
 PROTOTYPES: ENABLE
 
diff --git a/cpan/Digest-SHA/lib/Digest/SHA.pm b/cpan/Digest-SHA/lib/Digest/SHA.pm
index d57c16fce5..90893c6f06 100644
--- a/cpan/Digest-SHA/lib/Digest/SHA.pm
+++ b/cpan/Digest-SHA/lib/Digest/SHA.pm
@@ -6,7 +6,7 @@ use strict;
 use integer;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = '5.47';
+$VERSION = '5.48';
 
 require Exporter;
 require DynaLoader;
@@ -659,7 +659,7 @@ for their valuable comments and suggestions.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2003-2008 Mark Shelor
+Copyright (C) 2003-2010 Mark Shelor
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/cpan/Digest-SHA/shasum b/cpan/Digest-SHA/shasum
index a349ed7181..3c0185892f 100755
--- a/cpan/Digest-SHA/shasum
+++ b/cpan/Digest-SHA/shasum
@@ -2,10 +2,10 @@
 
 	# shasum: filter for computing SHA digests (analogous to sha1sum)
 	#
-	# Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
+	# Copyright (C) 2003-2010 Mark Shelor, All Rights Reserved
 	#
-	# Version: 5.47
-	# Wed Apr 30 04:00:54 MST 2008
+	# Version: 5.48
+	# Mon Jan  4 16:32:52 MST 2010
 
 =head1 NAME
 
@@ -49,11 +49,11 @@ I<shasum> through files, standard input, or both.
 The following command shows how easy it is to compute digests for typical
 inputs such as the NIST test vector "abc":
 
-	perl -e "print qw(abc)" | shasum
+	perl -e "print qq(abc)" | shasum
 
 Or, if you want to use SHA-256 instead of the default SHA-1, simply say:
 
-	perl -e "print qw(abc)" | shasum -a 256
+	perl -e "print qq(abc)" | shasum -a 256
 
 Since I<shasum> uses the same interface employed by the familiar
 I<sha1sum> program (and its somewhat outmoded anscestor I<md5sum>),
@@ -61,7 +61,7 @@ you can install this script as a convenient drop-in replacement.
 
 =head1 AUTHOR
 
-Copyright (c) 2003-2008 Mark Shelor <mshelor@cpan.org>.
+Copyright (c) 2003-2010 Mark Shelor <mshelor@cpan.org>.
 
 =head1 SEE ALSO
 
@@ -74,7 +74,7 @@ use strict;
 use FileHandle;
 use Getopt::Long;
 
-my $VERSION = "5.47";
+my $VERSION = "5.48";
 
 
 	# Try to use Digest::SHA, since it's faster.  If not installed,
@@ -164,7 +164,7 @@ usage(1, "shasum: --status option used only when verifying checksums\n")
 
 	# Default to SHA-1 unless overriden by command line option
 
-$alg = 1 unless $alg;
+$alg = 1 unless defined $alg;
 grep { $_ == $alg } (1, 224, 256, 384, 512)
 	or usage(1, "shasum: Unrecognized algorithm\n");
 
diff --git a/cpan/Digest-SHA/src/hmac.c b/cpan/Digest-SHA/src/hmac.c
index ca5536e67a..4c62181713 100644
--- a/cpan/Digest-SHA/src/hmac.c
+++ b/cpan/Digest-SHA/src/hmac.c
@@ -3,10 +3,10 @@
  *
  * Ref: FIPS PUB 198 The Keyed-Hash Message Authentication Code
  *
- * Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
+ * Copyright (C) 2003-2010 Mark Shelor, All Rights Reserved
  *
- * Version: 5.47
- * Wed Apr 30 04:00:54 MST 2008
+ * Version: 5.48
+ * Mon Jan  4 16:32:52 MST 2010
  *
  */
 
diff --git a/cpan/Digest-SHA/src/hmac.h b/cpan/Digest-SHA/src/hmac.h
index b2f5795f05..a7df09d260 100644
--- a/cpan/Digest-SHA/src/hmac.h
+++ b/cpan/Digest-SHA/src/hmac.h
@@ -3,10 +3,10 @@
  *
  * Ref: FIPS PUB 198 The Keyed-Hash Message Authentication Code
  *
- * Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
+ * Copyright (C) 2003-2010 Mark Shelor, All Rights Reserved
  *
- * Version: 5.47
- * Wed Apr 30 04:00:54 MST 2008
+ * Version: 5.48
+ * Mon Jan  4 16:32:52 MST 2010
  *
  */
 
diff --git a/cpan/Digest-SHA/src/sha.c b/cpan/Digest-SHA/src/sha.c
index eec969bc32..31b2ce8a20 100644
--- a/cpan/Digest-SHA/src/sha.c
+++ b/cpan/Digest-SHA/src/sha.c
@@ -3,10 +3,10 @@
  *
  * Ref: NIST FIPS PUB 180-2 Secure Hash Standard
  *
- * Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
+ * Copyright (C) 2003-2010 Mark Shelor, All Rights Reserved
  *
- * Version: 5.47
- * Wed Apr 30 04:00:54 MST 2008
+ * Version: 5.48
+ * Mon Jan  4 16:32:52 MST 2010
  *
  */
 
diff --git a/cpan/Digest-SHA/src/sha.h b/cpan/Digest-SHA/src/sha.h
index 6f18834a67..9b624a6eb6 100644
--- a/cpan/Digest-SHA/src/sha.h
+++ b/cpan/Digest-SHA/src/sha.h
@@ -3,10 +3,10 @@
  *
  * Ref: NIST FIPS PUB 180-2 Secure Hash Standard
  *
- * Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
+ * Copyright (C) 2003-2010 Mark Shelor, All Rights Reserved
  *
- * Version: 5.47
- * Wed Apr 30 04:00:54 MST 2008
+ * Version: 5.48
+ * Mon Jan  4 16:32:52 MST 2010
  *
  */
 
diff --git a/cpan/Digest-SHA/t/allfcns.t b/cpan/Digest-SHA/t/allfcns.t
index 34cc803412..9f2a9ba534 100644
--- a/cpan/Digest-SHA/t/allfcns.t
+++ b/cpan/Digest-SHA/t/allfcns.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(
 		hmac_sha1	hmac_sha1_base64	hmac_sha1_hex
diff --git a/cpan/Digest-SHA/t/base64.t b/cpan/Digest-SHA/t/base64.t
index 1675e9a04c..56a24d70e1 100644
--- a/cpan/Digest-SHA/t/base64.t
+++ b/cpan/Digest-SHA/t/base64.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$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));
diff --git a/cpan/Digest-SHA/t/bitbuf.t b/cpan/Digest-SHA/t/bitbuf.t
index 81597356f0..78b499baba 100644
--- a/cpan/Digest-SHA/t/bitbuf.t
+++ b/cpan/Digest-SHA/t/bitbuf.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw());
 }
diff --git a/cpan/Digest-SHA/t/dumpload.t b/cpan/Digest-SHA/t/dumpload.t
index 92b92867e3..24cea54c58 100644
--- a/cpan/Digest-SHA/t/dumpload.t
+++ b/cpan/Digest-SHA/t/dumpload.t
@@ -4,7 +4,7 @@ use FileHandle;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(sha384_hex sha512_hex));
 }
diff --git a/cpan/Digest-SHA/t/fips198.t b/cpan/Digest-SHA/t/fips198.t
index 0447aa6489..f6f5007f5f 100644
--- a/cpan/Digest-SHA/t/fips198.t
+++ b/cpan/Digest-SHA/t/fips198.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(hmac_sha1_hex));
 }
diff --git a/cpan/Digest-SHA/t/gg.t b/cpan/Digest-SHA/t/gg.t
index b43ec48bdf..7f973ef661 100644
--- a/cpan/Digest-SHA/t/gg.t
+++ b/cpan/Digest-SHA/t/gg.t
@@ -7,7 +7,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw());
 }
diff --git a/cpan/Digest-SHA/t/gglong.t b/cpan/Digest-SHA/t/gglong.t
index 4d8c53d77c..571048535e 100644
--- a/cpan/Digest-SHA/t/gglong.t
+++ b/cpan/Digest-SHA/t/gglong.t
@@ -8,7 +8,7 @@ use FileHandle;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw());
 }
diff --git a/cpan/Digest-SHA/t/hmacsha.t b/cpan/Digest-SHA/t/hmacsha.t
index a265a767d0..593b2b1989 100644
--- a/cpan/Digest-SHA/t/hmacsha.t
+++ b/cpan/Digest-SHA/t/hmacsha.t
@@ -5,7 +5,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(hmac_sha256_hex));
 }
diff --git a/cpan/Digest-SHA/t/ireland.t b/cpan/Digest-SHA/t/ireland.t
index 97bad44243..7de04f1691 100644
--- a/cpan/Digest-SHA/t/ireland.t
+++ b/cpan/Digest-SHA/t/ireland.t
@@ -4,7 +4,7 @@ use FileHandle;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw());
 }
diff --git a/cpan/Digest-SHA/t/methods.t b/cpan/Digest-SHA/t/methods.t
index 2a4a7c4a56..6ed690b5d4 100644
--- a/cpan/Digest-SHA/t/methods.t
+++ b/cpan/Digest-SHA/t/methods.t
@@ -4,7 +4,7 @@ use FileHandle;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw());
 }
diff --git a/cpan/Digest-SHA/t/nistbit.t b/cpan/Digest-SHA/t/nistbit.t
index 8516195989..9068815290 100644
--- a/cpan/Digest-SHA/t/nistbit.t
+++ b/cpan/Digest-SHA/t/nistbit.t
@@ -1,13 +1,13 @@
 # Test against SHA-1 Sample Vectors from NIST
 #
-#	ref: http://csrc.nist.gov/cryptval/shs.html
+#	ref: http://www.nsrl.nist.gov/testdata/
 
 use strict;
 
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw());
 }
diff --git a/cpan/Digest-SHA/t/nistbyte.t b/cpan/Digest-SHA/t/nistbyte.t
index 9c4a89d136..6d0c9ef070 100644
--- a/cpan/Digest-SHA/t/nistbyte.t
+++ b/cpan/Digest-SHA/t/nistbyte.t
@@ -1,13 +1,13 @@
 # Test against SHA-1 Sample Vectors from NIST
 #
-#	ref: http://csrc.nist.gov/cryptval/shs.html
+#	ref: http://www.nsrl.nist.gov/testdata/
 
 use strict;
 
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw());
 }
diff --git a/cpan/Digest-SHA/t/rfc2202.t b/cpan/Digest-SHA/t/rfc2202.t
index 8e21bbdff8..3efb50b5a5 100644
--- a/cpan/Digest-SHA/t/rfc2202.t
+++ b/cpan/Digest-SHA/t/rfc2202.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(hmac_sha1_hex));
 }
diff --git a/cpan/Digest-SHA/t/sha1.t b/cpan/Digest-SHA/t/sha1.t
index e7de6f2601..ed2c68edcf 100644
--- a/cpan/Digest-SHA/t/sha1.t
+++ b/cpan/Digest-SHA/t/sha1.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(sha1_hex));
 }
diff --git a/cpan/Digest-SHA/t/sha224.t b/cpan/Digest-SHA/t/sha224.t
index 6c2b45f0e3..e94820d485 100644
--- a/cpan/Digest-SHA/t/sha224.t
+++ b/cpan/Digest-SHA/t/sha224.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(sha224_hex));
 }
diff --git a/cpan/Digest-SHA/t/sha256.t b/cpan/Digest-SHA/t/sha256.t
index 591f432c94..78aeb9dc3d 100644
--- a/cpan/Digest-SHA/t/sha256.t
+++ b/cpan/Digest-SHA/t/sha256.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(sha256_hex));
 }
diff --git a/cpan/Digest-SHA/t/sha384.t b/cpan/Digest-SHA/t/sha384.t
index a6fbd360c7..f275bba886 100644
--- a/cpan/Digest-SHA/t/sha384.t
+++ b/cpan/Digest-SHA/t/sha384.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(sha384_hex));
 }
diff --git a/cpan/Digest-SHA/t/sha512.t b/cpan/Digest-SHA/t/sha512.t
index 7228554066..4b65412c6a 100644
--- a/cpan/Digest-SHA/t/sha512.t
+++ b/cpan/Digest-SHA/t/sha512.t
@@ -3,7 +3,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(sha512_hex));
 }
diff --git a/cpan/Digest-SHA/t/woodbury.t b/cpan/Digest-SHA/t/woodbury.t
index d56e8108a8..9e45cf9d96 100644
--- a/cpan/Digest-SHA/t/woodbury.t
+++ b/cpan/Digest-SHA/t/woodbury.t
@@ -7,7 +7,7 @@ use strict;
 my $MODULE;
 
 BEGIN {
-	$MODULE = ($ENV{PERL_CORE} || -d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
+	$MODULE = (-d "src") ? "Digest::SHA" : "Digest::SHA::PurePerl";
 	eval "require $MODULE" || die $@;
 	$MODULE->import(qw(hmac_sha256_hex hmac_sha384_hex hmac_sha512_hex));
 }