Upgrade Digest-SHA to 5.71.

14 files changed, 46 insertions, 32 deletions

diff --git a/cpan/Digest-SHA/Changes b/cpan/Digest-SHA/Changes
index 56d42b5202..5f9d1cc777 100644
--- a/cpan/Digest-SHA/Changes
+++ b/cpan/Digest-SHA/Changes
@@ -1,5 +1,10 @@
 Revision history for Perl extension Digest::SHA.
 
+5.71  Wed Feb 29 04:06:10 MST 2012
+	- prevented $! from getting clobbered in _bail() routine
+		-- thanks to Zefram for patch
+	- added example of BITS mode usage to shasum documentation
+
 5.70  Wed Dec 14 02:32:10 MST 2011
 	- added BITS mode to addfile method and shasum
 		-- partial-byte inputs now possible via files/STDIN
diff --git a/cpan/Digest-SHA/README b/cpan/Digest-SHA/README
index a8703a8970..2478b1ec54 100644
--- a/cpan/Digest-SHA/README
+++ b/cpan/Digest-SHA/README
@@ -1,4 +1,4 @@
-Digest::SHA version 5.70
+Digest::SHA version 5.71
 ========================
 
 Digest::SHA is a complete implementation of the NIST Secure Hash
@@ -34,7 +34,7 @@ DEPENDENCIES
 
 COPYRIGHT AND LICENSE
 
-Copyright (C) 2003-2011 Mark Shelor
+Copyright (C) 2003-2012 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/lib/Digest/SHA.pm b/cpan/Digest-SHA/lib/Digest/SHA.pm
index 0f6338b2d0..d8cc56136b 100644
--- a/cpan/Digest-SHA/lib/Digest/SHA.pm
+++ b/cpan/Digest-SHA/lib/Digest/SHA.pm
@@ -7,7 +7,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 use Fcntl;
 use integer;
 
-$VERSION = '5.70';
+$VERSION = '5.71';
 
 require Exporter;
 require DynaLoader;
@@ -89,8 +89,9 @@ sub add_bits {
 sub _bail {
 	my $msg = shift;
 
+	$msg .= ": $!";
         require Carp;
-        Carp::croak("$msg: $!");
+        Carp::croak($msg);
 }
 
 sub _addfile {  # this is "addfile" from Digest::base 1.00
@@ -706,7 +707,7 @@ darkness and moored it in so perfect a calm and in so brilliant a light"
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2003-2011 Mark Shelor
+Copyright (C) 2003-2012 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 344e8e1af6..d75815a378 100644
--- a/cpan/Digest-SHA/shasum
+++ b/cpan/Digest-SHA/shasum
@@ -2,14 +2,15 @@
 
 	## shasum: filter for computing SHA digests (ref. sha1sum/md5sum)
 	##
-	## Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved
+	## Copyright (C) 2003-2012 Mark Shelor, All Rights Reserved
 	##
-	## Version: 5.70
-	## Wed Dec 14 02:32:10 MST 2011
+	## Version: 5.71
+	## Wed Feb 29 04:06:10 MST 2012
 
 	## shasum SYNOPSIS adapted from GNU Coreutils sha1sum.
-	## Include an "-a" option for algorithm selection, and a
-	## "-p" option for portable digest computation.
+	## Add an "-a" option for algorithm selection, a "-p"
+	## option for portable digest computation, and a "-0"
+	## option for reading bit strings.
 
 my $POD = <<'END_OF_POD';
 
@@ -26,13 +27,13 @@ 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
+   -t, --text        read in text mode (default)
    -p, --portable    read in portable mode
                          produces same digest on Windows/Unix/Mac
    -0, --01          read in BITS mode
                          ASCII '0' interpreted as 0-bit,
                          ASCII '1' interpreted as 1-bit,
                          all other characters ignored
-   -t, --text        read in text mode (default)
 
  The following two options are useful only when verifying checksums:
    -s, --status      don't output anything, status code shows success
@@ -72,9 +73,16 @@ Since I<shasum> mimics the behavior of the combined GNU I<sha1sum>,
 I<sha224sum>, I<sha256sum>, I<sha384sum>, and I<sha512sum> programs,
 you can install this script as a convenient drop-in replacement.
 
+Unlike the GNU programs, I<shasum> encompasses the full SHA standard by
+allowing partial-byte inputs.  This is accomplished through the BITS
+option (I<-0>).  The following example computes the SHA-224 digest of
+the 7-bit message I<0001100>:
+
+	perl -e "print qq(0001100)" | shasum -0 -a 224
+
 =head1 AUTHOR
 
-Copyright (c) 2003-2011 Mark Shelor <mshelor@cpan.org>.
+Copyright (c) 2003-2012 Mark Shelor <mshelor@cpan.org>.
 
 =head1 SEE ALSO
 
@@ -89,7 +97,7 @@ use strict;
 use Fcntl;
 use Getopt::Long;
 
-my $VERSION = "5.70";
+my $VERSION = "5.71";
 
 
 	## Try to use Digest::SHA.  If not installed, use the slower
diff --git a/cpan/Digest-SHA/src/hmac.c b/cpan/Digest-SHA/src/hmac.c
index c820bc5d56..5d782ac75b 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-2011 Mark Shelor, All Rights Reserved
+ * Copyright (C) 2003-2012 Mark Shelor, All Rights Reserved
  *
- * Version: 5.70
- * Wed Dec 14 02:32:10 MST 2011
+ * Version: 5.71
+ * Wed Feb 29 04:06:10 MST 2012
  *
  */
 
diff --git a/cpan/Digest-SHA/src/hmac.h b/cpan/Digest-SHA/src/hmac.h
index 757c05208c..ce592777d1 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-2011 Mark Shelor, All Rights Reserved
+ * Copyright (C) 2003-2012 Mark Shelor, All Rights Reserved
  *
- * Version: 5.70
- * Wed Dec 14 02:32:10 MST 2011
+ * Version: 5.71
+ * Wed Feb 29 04:06:10 MST 2012
  *
  */
 
diff --git a/cpan/Digest-SHA/src/sha.c b/cpan/Digest-SHA/src/sha.c
index cfec4dbde5..4aaba5f0a9 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-2011 Mark Shelor, All Rights Reserved
+ * Copyright (C) 2003-2012 Mark Shelor, All Rights Reserved
  *
- * Version: 5.70
- * Wed Dec 14 02:32:10 MST 2011
+ * Version: 5.71
+ * Wed Feb 29 04:06:10 MST 2012
  *
  */
 
diff --git a/cpan/Digest-SHA/src/sha.h b/cpan/Digest-SHA/src/sha.h
index 048044bf50..1c80dbc978 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-2011 Mark Shelor, All Rights Reserved
+ * Copyright (C) 2003-2012 Mark Shelor, All Rights Reserved
  *
- * Version: 5.70
- * Wed Dec 14 02:32:10 MST 2011
+ * Version: 5.71
+ * Wed Feb 29 04:06:10 MST 2012
  *
  */
 
diff --git a/cpan/Digest-SHA/t/base64.t b/cpan/Digest-SHA/t/base64.t
index 56a24d70e1..2cafdbd8de 100644
--- a/cpan/Digest-SHA/t/base64.t
+++ b/cpan/Digest-SHA/t/base64.t
@@ -31,7 +31,7 @@ while (@out) {
 	unless ($skip) {
 		print "not " unless &$fcn($in) eq $rsp;
 	}
-	print "ok ", $testnum++, $skip ? " # skip: no 64 bit" : "", "\n";
+	print "ok ", $testnum++, $skip ? " # skip: no 64-bit" : "", "\n";
 }
 
 __DATA__
diff --git a/cpan/Digest-SHA/t/dumpload.t b/cpan/Digest-SHA/t/dumpload.t
index 24cea54c58..a1f1cf4101 100644
--- a/cpan/Digest-SHA/t/dumpload.t
+++ b/cpan/Digest-SHA/t/dumpload.t
@@ -51,7 +51,7 @@ while (@sharsp) {
 	if ($alg == 384) { $skip = sha384_hex("") ? 0 : 1 }
 	if ($alg == 512) { $skip = sha512_hex("") ? 0 : 1 }
 	if ($skip) {
-		print "ok ", $testnum++, " # skip: no 64 bit\n";
+		print "ok ", $testnum++, " # skip: no 64-bit\n";
 		next;
 	}
 	my $digest;
diff --git a/cpan/Digest-SHA/t/fips180-4.t b/cpan/Digest-SHA/t/fips180-4.t
index 5155089542..78feb8d6c8 100644
--- a/cpan/Digest-SHA/t/fips180-4.t
+++ b/cpan/Digest-SHA/t/fips180-4.t
@@ -31,7 +31,7 @@ for (1 .. $numtests) {
 			sha512224_hex($data) : sha512256_hex($data);
 		print "not " unless $rsp eq $digest;
 	}
-	print "ok ", $_, $skip ? " # skip: no 64 bit" : "", "\n";
+	print "ok ", $_, $skip ? " # skip: no 64-bit" : "", "\n";
 }
 
 __DATA__
diff --git a/cpan/Digest-SHA/t/sha384.t b/cpan/Digest-SHA/t/sha384.t
index f275bba886..9d026ae1ff 100644
--- a/cpan/Digest-SHA/t/sha384.t
+++ b/cpan/Digest-SHA/t/sha384.t
@@ -29,7 +29,7 @@ for (1 .. $numtests) {
 	unless ($skip) {
 		print "not " unless sha384_hex($data) eq $digest;
 	}
-	print "ok ", $_, $skip ? " # skip: no 64 bit" : "", "\n";
+	print "ok ", $_, $skip ? " # skip: no 64-bit" : "", "\n";
 }
 
 __DATA__
diff --git a/cpan/Digest-SHA/t/sha512.t b/cpan/Digest-SHA/t/sha512.t
index 4b65412c6a..fcfe766961 100644
--- a/cpan/Digest-SHA/t/sha512.t
+++ b/cpan/Digest-SHA/t/sha512.t
@@ -29,7 +29,7 @@ for (1 .. $numtests) {
 	unless ($skip) {
 		print "not " unless sha512_hex($data) eq $digest;
 	}
-	print "ok ", $_, $skip ? " # skip: no 64 bit" : "", "\n";
+	print "ok ", $_, $skip ? " # skip: no 64-bit" : "", "\n";
 }
 
 __DATA__
diff --git a/cpan/Digest-SHA/t/woodbury.t b/cpan/Digest-SHA/t/woodbury.t
index 9e45cf9d96..35f4e6af79 100644
--- a/cpan/Digest-SHA/t/woodbury.t
+++ b/cpan/Digest-SHA/t/woodbury.t
@@ -54,7 +54,7 @@ my $skip = hmac_sha384_hex("", "") ? 0 : 1;
 while (@data_bs1024) {
 	if ($skip) {
 		print "ok ", $testnum++,
-			$skip ? " # skip: no 64 bit" : "", "\n";
+			$skip ? " # skip: no 64-bit" : "", "\n";
 		shift @data_bs1024;
 		next;
 	}
@@ -67,7 +67,7 @@ while (@data_bs1024) {
 while (@dat2_bs1024) {
 	if ($skip) {
 		print "ok ", $testnum++,
-			$skip ? " # skip: no 64 bit" : "", "\n";
+			$skip ? " # skip: no 64-bit" : "", "\n";
 		shift @dat2_bs1024;
 		next;
 	}