From a078003682203ddbf26af906495f174c933dd77f Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Wed, 9 Nov 2011 21:04:32 +0000 Subject: Update Digest-SHA to CPAN version 5.63 [DELTA] 5.63 Tue Nov 8 02:36:42 MST 2011 - added code to allow very large data inputs all at once -- previously limited to several hundred MB at a time -- many thanks to Thomas Drugeon for his elegant patch - removed outdated reference URLs from several test scripts -- these URLs aren't essential, and often go stale -- thanks to Leon Brocard for spotting this -- ref. rt.cpan.org #68740 --- cpan/Digest-SHA/Changes | 9 +++++++++ cpan/Digest-SHA/README | 2 +- cpan/Digest-SHA/SHA.xs | 17 +++++++++++++++++ cpan/Digest-SHA/lib/Digest/SHA.pm | 3 ++- cpan/Digest-SHA/shasum | 6 +++--- cpan/Digest-SHA/src/hmac.c | 4 ++-- cpan/Digest-SHA/src/hmac.h | 4 ++-- cpan/Digest-SHA/src/sha.c | 4 ++-- cpan/Digest-SHA/src/sha.h | 4 ++-- cpan/Digest-SHA/t/gg.t | 2 -- cpan/Digest-SHA/t/gglong.t | 2 -- cpan/Digest-SHA/t/nistbit.t | 2 -- cpan/Digest-SHA/t/nistbyte.t | 2 -- 13 files changed, 40 insertions(+), 21 deletions(-) (limited to 'cpan') diff --git a/cpan/Digest-SHA/Changes b/cpan/Digest-SHA/Changes index 80529d3c2a..b6c056f0ac 100644 --- a/cpan/Digest-SHA/Changes +++ b/cpan/Digest-SHA/Changes @@ -1,5 +1,14 @@ Revision history for Perl extension Digest::SHA. +5.63 Tue Nov 8 02:36:42 MST 2011 + - added code to allow very large data inputs all at once + -- previously limited to several hundred MB at a time + -- many thanks to Thomas Drugeon for his elegant patch + - removed outdated reference URLs from several test scripts + -- these URLs aren't essential, and often go stale + -- thanks to Leon Brocard for spotting this + -- ref. rt.cpan.org #68740 + 5.62 Sat May 14 04:00:34 MST 2011 - removed unnecessary loading of MIME::Base64 module -- thanks to dolmen for pointing this out diff --git a/cpan/Digest-SHA/README b/cpan/Digest-SHA/README index e83311f859..8498bb34fb 100644 --- a/cpan/Digest-SHA/README +++ b/cpan/Digest-SHA/README @@ -1,4 +1,4 @@ -Digest::SHA version 5.62 +Digest::SHA version 5.63 ======================== Digest::SHA is a complete implementation of the NIST Secure Hash diff --git a/cpan/Digest-SHA/SHA.xs b/cpan/Digest-SHA/SHA.xs index 7088a33bf6..8124a5de70 100644 --- a/cpan/Digest-SHA/SHA.xs +++ b/cpan/Digest-SHA/SHA.xs @@ -20,6 +20,8 @@ PROTOTYPES: ENABLE #define INT2PTR(p, i) (p) (i) #endif +#define MAX_WRITE_SIZE 16384 + int shaclose(s) SHA * s @@ -86,6 +88,11 @@ PPCODE: XSRETURN_UNDEF; for (i = 0; i < items; i++) { data = (unsigned char *) (SvPV(ST(i), len)); + while (len > MAX_WRITE_SIZE) { + shawrite(data, MAX_WRITE_SIZE << 3, state); + data += MAX_WRITE_SIZE; + len -= MAX_WRITE_SIZE; + } shawrite(data, len << 3, state); } shafinish(state); @@ -139,6 +146,11 @@ PPCODE: XSRETURN_UNDEF; for (i = 0; i < items - 1; i++) { data = (unsigned char *) (SvPV(ST(i), len)); + while (len > MAX_WRITE_SIZE) { + hmacwrite(data, MAX_WRITE_SIZE << 3, state); + data += MAX_WRITE_SIZE; + len -= MAX_WRITE_SIZE; + } hmacwrite(data, len << 3, state); } hmacfinish(state); @@ -182,6 +194,11 @@ PPCODE: state = INT2PTR(SHA *, SvIV(SvRV(SvRV(self)))); for (i = 1; i < items; i++) { data = (unsigned char *) (SvPV(ST(i), len)); + while (len > MAX_WRITE_SIZE) { + shawrite(data, MAX_WRITE_SIZE << 3, state); + data += MAX_WRITE_SIZE; + len -= MAX_WRITE_SIZE; + } shawrite(data, len << 3, state); } XSRETURN(1); diff --git a/cpan/Digest-SHA/lib/Digest/SHA.pm b/cpan/Digest-SHA/lib/Digest/SHA.pm index 0c649c087c..ce652b63d1 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.62'; +$VERSION = '5.63'; require Exporter; require DynaLoader; @@ -669,6 +669,7 @@ The author is particularly grateful to Chris Carey Alexandr Ciornii Jim Doble + Thomas Drugeon Julius Duque Jeffrey Friedl Robert Gilmour diff --git a/cpan/Digest-SHA/shasum b/cpan/Digest-SHA/shasum index 9f3ca4f22c..4dd2572fca 100644 --- a/cpan/Digest-SHA/shasum +++ b/cpan/Digest-SHA/shasum @@ -4,8 +4,8 @@ ## ## Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved ## - ## Version: 5.62 - ## Sat May 14 04:00:34 MST 2011 + ## Version: 5.63 + ## Tue Nov 8 02:36:42 MST 2011 ## shasum SYNOPSIS adapted from GNU Coreutils sha1sum. ## Include an "-a" option for algorithm selection, and a @@ -85,7 +85,7 @@ use strict; use Fcntl; use Getopt::Long; -my $VERSION = "5.62"; +my $VERSION = "5.63"; ## 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 05c8a371c4..35fd887f76 100644 --- a/cpan/Digest-SHA/src/hmac.c +++ b/cpan/Digest-SHA/src/hmac.c @@ -5,8 +5,8 @@ * * Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved * - * Version: 5.62 - * Sat May 14 04:00:34 MST 2011 + * Version: 5.63 + * Tue Nov 8 02:36:42 MST 2011 * */ diff --git a/cpan/Digest-SHA/src/hmac.h b/cpan/Digest-SHA/src/hmac.h index 626be6e968..d08bd9a45c 100644 --- a/cpan/Digest-SHA/src/hmac.h +++ b/cpan/Digest-SHA/src/hmac.h @@ -5,8 +5,8 @@ * * Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved * - * Version: 5.62 - * Sat May 14 04:00:34 MST 2011 + * Version: 5.63 + * Tue Nov 8 02:36:42 MST 2011 * */ diff --git a/cpan/Digest-SHA/src/sha.c b/cpan/Digest-SHA/src/sha.c index 7020c2ee02..2cd0fa319e 100644 --- a/cpan/Digest-SHA/src/sha.c +++ b/cpan/Digest-SHA/src/sha.c @@ -5,8 +5,8 @@ * * Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved * - * Version: 5.62 - * Sat May 14 04:00:34 MST 2011 + * Version: 5.63 + * Tue Nov 8 02:36:42 MST 2011 * */ diff --git a/cpan/Digest-SHA/src/sha.h b/cpan/Digest-SHA/src/sha.h index fc074325c0..ed260c6cfe 100644 --- a/cpan/Digest-SHA/src/sha.h +++ b/cpan/Digest-SHA/src/sha.h @@ -5,8 +5,8 @@ * * Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved * - * Version: 5.62 - * Sat May 14 04:00:34 MST 2011 + * Version: 5.63 + * Tue Nov 8 02:36:42 MST 2011 * */ diff --git a/cpan/Digest-SHA/t/gg.t b/cpan/Digest-SHA/t/gg.t index 7f973ef661..6ca8f7fb9c 100644 --- a/cpan/Digest-SHA/t/gg.t +++ b/cpan/Digest-SHA/t/gg.t @@ -1,6 +1,4 @@ # Test against short bitwise vectors from Jim Gillogly and Francois Grieu -# -# http://www.chiark.greenend.org.uk/pipermail/ukcrypto/1999-February/003538.html use strict; diff --git a/cpan/Digest-SHA/t/gglong.t b/cpan/Digest-SHA/t/gglong.t index 571048535e..12f7e5df81 100644 --- a/cpan/Digest-SHA/t/gglong.t +++ b/cpan/Digest-SHA/t/gglong.t @@ -1,6 +1,4 @@ # Test against long bitwise vectors from Jim Gillogly and Francois Grieu -# -# http://www.chiark.greenend.org.uk/pipermail/ukcrypto/1999-February/003538.html use strict; use FileHandle; diff --git a/cpan/Digest-SHA/t/nistbit.t b/cpan/Digest-SHA/t/nistbit.t index 9068815290..91dc2804d9 100644 --- a/cpan/Digest-SHA/t/nistbit.t +++ b/cpan/Digest-SHA/t/nistbit.t @@ -1,6 +1,4 @@ # Test against SHA-1 Sample Vectors from NIST -# -# ref: http://www.nsrl.nist.gov/testdata/ use strict; diff --git a/cpan/Digest-SHA/t/nistbyte.t b/cpan/Digest-SHA/t/nistbyte.t index 6d0c9ef070..ce133d6467 100644 --- a/cpan/Digest-SHA/t/nistbyte.t +++ b/cpan/Digest-SHA/t/nistbyte.t @@ -1,6 +1,4 @@ # Test against SHA-1 Sample Vectors from NIST -# -# ref: http://www.nsrl.nist.gov/testdata/ use strict; -- cgit v1.2.1