summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Shelor <mshelor@cpan.org>2014-04-16 16:05:45 +1000
committerRicardo Signes <rjbs@cpan.org>2014-07-11 21:20:17 -0400
commit0e7dab7477c04c0e23a6d998505a40960eb803cd (patch)
tree9ec9c6624c04f2dbfb6846fd892abd8b29074aa9
parent2b76cf41a496dbb4d2b2ccf00c221463f3dbf5b7 (diff)
downloadperl-0e7dab7477c04c0e23a6d998505a40960eb803cd.tar.gz
backport Digest::SHA fix
-rw-r--r--AUTHORS1
-rw-r--r--cpan/Digest-SHA/SHA.xs8
-rw-r--r--cpan/Digest-SHA/lib/Digest/SHA.pm2
3 files changed, 10 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 9cf6807f81..e39e1e1cb7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -733,6 +733,7 @@ Mark P. Lutz <mark.p.lutz@boeing.com>
Mark Pease <peasem@primenet.com>
Mark Pizzolato <mark@infocomm.com>
Mark R. Levinson <mrl@isc.upenn.edu>
+Mark Shelor <mshelor@cpan.org>
Mark Stosberg <mark@summersault.com>
Marko Asplund <aspa@merlot.kronodoc.fi>
Marnix van Ammers <marnix@gmail.com>
diff --git a/cpan/Digest-SHA/SHA.xs b/cpan/Digest-SHA/SHA.xs
index 47bef28e61..cb54fc4fea 100644
--- a/cpan/Digest-SHA/SHA.xs
+++ b/cpan/Digest-SHA/SHA.xs
@@ -34,6 +34,8 @@ shaclose(s)
CODE:
RETVAL = shaclose(s);
sv_setiv(SvRV(ST(0)), 0);
+OUTPUT:
+ RETVAL
int
shadump(file, s)
@@ -186,6 +188,8 @@ PREINIT:
SHA *state;
int result;
PPCODE:
+ if (!sv_isa(self, "Digest::SHA"))
+ XSRETURN_UNDEF;
state = INT2PTR(SHA *, SvIV(SvRV(SvRV(self))));
result = ix ? shaalg(state) : shadsize(state) << 3;
ST(0) = sv_2mortal(newSViv(result));
@@ -200,6 +204,8 @@ PREINIT:
STRLEN len;
SHA *state;
PPCODE:
+ if (!sv_isa(self, "Digest::SHA"))
+ XSRETURN_UNDEF;
state = INT2PTR(SHA *, SvIV(SvRV(SvRV(self))));
for (i = 1; i < items; i++) {
data = (unsigned char *) (SvPVbyte(ST(i), len));
@@ -224,6 +230,8 @@ PREINIT:
SHA *state;
char *result;
PPCODE:
+ if (!sv_isa(self, "Digest::SHA"))
+ XSRETURN_UNDEF;
state = INT2PTR(SHA *, SvIV(SvRV(SvRV(self))));
shafinish(state);
len = 0;
diff --git a/cpan/Digest-SHA/lib/Digest/SHA.pm b/cpan/Digest-SHA/lib/Digest/SHA.pm
index 9a631b1fe9..4f84f97375 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.84_01';
+$VERSION = '5.84_02';
require Exporter;
require DynaLoader;