author | Vladimir Marek <Vladimir.Marek@oracle.com> |
Mon, 04 Jun 2012 23:18:44 -0700 | |
branch | s11-sru |
changeset 2288 | 6e4cb6b2ecfe |
parent 2287 | e77c012d95e9 |
child 884 | cd5a2da081ff |
permissions | -rw-r--r-- |
2287
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
1 |
diff -Naur perl-5.12.4/cpan/Digest/Changes new/cpan/Digest/Changes |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
2 |
--- perl-5.12.4/cpan/Digest/Changes 2011-06-01 00:47:46.000000000 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
3 |
+++ new/cpan/Digest/Changes 2012-04-09 14:20:51.773966321 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
4 |
@@ -1,3 +1,24 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
5 |
+2011-10-02 Gisle Aas <[email protected]> |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
6 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
7 |
+ Release 1.17. |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
8 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
9 |
+ Gisle Aas (6): |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
10 |
+ Less noisy 'git status' output |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
11 |
+ Merge pull request #1 from schwern/bug/require_eval |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
12 |
+ Don't clobber $@ in Digest->new [RT#50663] |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
13 |
+ More meta info added to Makefile.PL |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
14 |
+ Fix typo in RIPEMD160 [RT#50629] |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
15 |
+ Add schwern's test files |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
16 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
17 |
+ Michael G. Schwern (5): |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
18 |
+ Turn on strict. |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
19 |
+ Convert tests to use Test::More |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
20 |
+ Untabify |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
21 |
+ Turn Digest::Dummy into a real file which exercises the Digest->new() require logic. |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
22 |
+ Close the eval "require $module" security hole in Digest->new($algorithm) |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
23 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
24 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
25 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
26 |
2009-06-09 Gisle Aas <[email protected]> |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
27 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
28 |
Release 1.16. |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
29 |
diff -Naur perl-5.12.4/cpan/Digest/Digest.pm new/cpan/Digest/Digest.pm |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
30 |
--- perl-5.12.4/cpan/Digest/Digest.pm 2011-06-01 00:47:46.000000000 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
31 |
+++ new/cpan/Digest/Digest.pm 2012-04-09 14:20:51.876396277 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
32 |
@@ -3,7 +3,7 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
33 |
use strict; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
34 |
use vars qw($VERSION %MMAP $AUTOLOAD); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
35 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
36 |
-$VERSION = "1.16"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
37 |
+$VERSION = "1.17"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
38 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
39 |
%MMAP = ( |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
40 |
"SHA-1" => [["Digest::SHA", 1], "Digest::SHA1", ["Digest::SHA2", 1]], |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
41 |
@@ -16,7 +16,7 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
42 |
"CRC-16" => [["Digest::CRC", type => "crc16"]], |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
43 |
"CRC-32" => [["Digest::CRC", type => "crc32"]], |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
44 |
"CRC-CCITT" => [["Digest::CRC", type => "crcccitt"]], |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
45 |
- "RIPEMD-160" => "Crypt::PIPEMD160", |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
46 |
+ "RIPEMD-160" => "Crypt::RIPEMD160", |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
47 |
); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
48 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
49 |
sub new |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
50 |
@@ -24,24 +24,27 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
51 |
shift; # class ignored |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
52 |
my $algorithm = shift; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
53 |
my $impl = $MMAP{$algorithm} || do { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
54 |
- $algorithm =~ s/\W+//; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
55 |
- "Digest::$algorithm"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
56 |
+ $algorithm =~ s/\W+//g; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
57 |
+ "Digest::$algorithm"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
58 |
}; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
59 |
$impl = [$impl] unless ref($impl); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
60 |
+ local $@; # don't clobber it for our caller |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
61 |
my $err; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
62 |
for (@$impl) { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
63 |
- my $class = $_; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
64 |
- my @args; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
65 |
- ($class, @args) = @$class if ref($class); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
66 |
- no strict 'refs'; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
67 |
- unless (exists ${"$class\::"}{"VERSION"}) { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
68 |
- eval "require $class"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
69 |
- if ($@) { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
70 |
- $err ||= $@; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
71 |
- next; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
72 |
- } |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
73 |
- } |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
74 |
- return $class->new(@args, @_); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
75 |
+ my $class = $_; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
76 |
+ my @args; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
77 |
+ ($class, @args) = @$class if ref($class); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
78 |
+ no strict 'refs'; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
79 |
+ unless (exists ${"$class\::"}{"VERSION"}) { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
80 |
+ my $pm_file = $class . ".pm"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
81 |
+ $pm_file =~ s{::}{/}g; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
82 |
+ eval { require $pm_file }; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
83 |
+ if ($@) { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
84 |
+ $err ||= $@; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
85 |
+ next; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
86 |
+ } |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
87 |
+ } |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
88 |
+ return $class->new(@args, @_); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
89 |
} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
90 |
die $err; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
91 |
} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
92 |
diff -Naur perl-5.12.4/cpan/Digest/t/base.t new/cpan/Digest/t/base.t |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
93 |
--- perl-5.12.4/cpan/Digest/t/base.t 2011-06-01 00:47:46.000000000 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
94 |
+++ new/cpan/Digest/t/base.t 2012-04-09 14:20:51.993284381 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
95 |
@@ -1,7 +1,6 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
96 |
#!perl -w |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
97 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
98 |
-use Test qw(plan ok); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
99 |
-plan tests => 12; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
100 |
+use Test::More tests => 12; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
101 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
102 |
{ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
103 |
package LenDigest; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
104 |
@@ -31,26 +30,26 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
105 |
} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
106 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
107 |
my $ctx = LenDigest->new; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
108 |
-ok($ctx->digest, "X0000"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
109 |
+is($ctx->digest, "X0000"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
110 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
111 |
my $EBCDIC = ord('A') == 193; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
112 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
113 |
if ($EBCDIC) { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
114 |
- ok($ctx->hexdigest, "e7f0f0f0f0"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
115 |
- ok($ctx->b64digest, "5/Dw8PA"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
116 |
+ is($ctx->hexdigest, "e7f0f0f0f0"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
117 |
+ is($ctx->b64digest, "5/Dw8PA"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
118 |
} else { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
119 |
- ok($ctx->hexdigest, "5830303030"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
120 |
- ok($ctx->b64digest, "WDAwMDA"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
121 |
+ is($ctx->hexdigest, "5830303030"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
122 |
+ is($ctx->b64digest, "WDAwMDA"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
123 |
} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
124 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
125 |
$ctx->add("foo"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
126 |
-ok($ctx->digest, "f0003"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
127 |
+is($ctx->digest, "f0003"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
128 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
129 |
$ctx->add("foo"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
130 |
-ok($ctx->hexdigest, $EBCDIC ? "86f0f0f0f3" : "6630303033"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
131 |
+is($ctx->hexdigest, $EBCDIC ? "86f0f0f0f3" : "6630303033"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
132 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
133 |
$ctx->add("foo"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
134 |
-ok($ctx->b64digest, $EBCDIC ? "hvDw8PM" : "ZjAwMDM"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
135 |
+is($ctx->b64digest, $EBCDIC ? "hvDw8PM" : "ZjAwMDM"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
136 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
137 |
open(F, ">xxtest$$") || die; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
138 |
binmode(F); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
139 |
@@ -62,23 +61,23 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
140 |
close(F); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
141 |
unlink("xxtest$$") || warn; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
142 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
143 |
-ok($ctx->digest, "a0301"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
144 |
+is($ctx->digest, "a0301"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
145 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
146 |
eval { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
147 |
$ctx->add_bits("1010"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
148 |
}; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
149 |
-ok($@ =~ /^Number of bits must be multiple of 8/); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
150 |
+like($@, '/^Number of bits must be multiple of 8/'); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
151 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
152 |
$ctx->add_bits($EBCDIC ? "11100100" : "01010101"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
153 |
-ok($ctx->digest, "U0001"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
154 |
+is($ctx->digest, "U0001"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
155 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
156 |
eval { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
157 |
$ctx->add_bits("abc", 12); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
158 |
}; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
159 |
-ok($@ =~ /^Number of bits must be multiple of 8/); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
160 |
+like($@, '/^Number of bits must be multiple of 8/'); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
161 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
162 |
$ctx->add_bits("abc", 16); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
163 |
-ok($ctx->digest, "a0002"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
164 |
+is($ctx->digest, "a0002"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
165 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
166 |
$ctx->add_bits("abc", 32); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
167 |
-ok($ctx->digest, "a0003"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
168 |
+is($ctx->digest, "a0003"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
169 |
diff -Naur perl-5.12.4/cpan/Digest/t/digest.t new/cpan/Digest/t/digest.t |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
170 |
--- perl-5.12.4/cpan/Digest/t/digest.t 2011-06-01 00:47:46.000000000 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
171 |
+++ new/cpan/Digest/t/digest.t 2012-04-16 14:02:55.704568190 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
172 |
@@ -1,36 +1,23 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
173 |
-print "1..3\n"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
174 |
+#!/usr/bin/env perl |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
175 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
176 |
-use Digest; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
177 |
+use strict; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
178 |
+use Test::More tests => 4; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
179 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
180 |
+# To find Digest::Dummy |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
181 |
+use lib 't/lib'; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
182 |
+use lib 'lib'; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
183 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
184 |
-{ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
185 |
- package Digest::Dummy; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
186 |
- use vars qw($VERSION @ISA); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
187 |
- $VERSION = 1; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
188 |
- |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
189 |
- require Digest::base; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
190 |
- @ISA = qw(Digest::base); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
191 |
- |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
192 |
- sub new { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
193 |
- my $class = shift; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
194 |
- my $d = shift || "ooo"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
195 |
- bless { d => $d }, $class; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
196 |
- } |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
197 |
- sub add {} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
198 |
- sub digest { shift->{d} } |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
199 |
-} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
200 |
+use Digest; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
201 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
202 |
+$@ = "rt#50663"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
203 |
my $d; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
204 |
$d = Digest->new("Dummy"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
205 |
-print "not " unless $d->digest eq "ooo"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
206 |
-print "ok 1\n"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
207 |
+is $@, "rt#50663"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
208 |
+is $d->digest, "ooo"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
209 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
210 |
$d = Digest->Dummy; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
211 |
-print "not " unless $d->digest eq "ooo"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
212 |
-print "ok 2\n"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
213 |
+is $d->digest, "ooo"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
214 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
215 |
$Digest::MMAP{"Dummy-24"} = [["NotThere"], "NotThereEither", ["Digest::Dummy", 24]]; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
216 |
$d = Digest->new("Dummy-24"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
217 |
-print "not " unless $d->digest eq "24"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
218 |
-print "ok 3\n"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
219 |
- |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
220 |
- |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
221 |
+is $d->digest, "24"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
222 |
diff -Naur perl-5.12.4/cpan/Digest/t/file.t new/cpan/Digest/t/file.t |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
223 |
--- perl-5.12.4/cpan/Digest/t/file.t 2011-06-01 00:47:46.000000000 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
224 |
+++ new/cpan/Digest/t/file.t 2012-04-09 14:20:52.032053178 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
225 |
@@ -1,7 +1,6 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
226 |
#!perl -w |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
227 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
228 |
-use Test qw(plan ok); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
229 |
-plan tests => 5; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
230 |
+use Test::More tests => 5; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
231 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
232 |
{ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
233 |
package Digest::Foo; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
234 |
@@ -36,17 +35,17 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
235 |
print F "foo\0\n"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
236 |
close(F) || die "Can't write '$file': $!"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
237 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
238 |
-ok(digest_file($file, "Foo"), "0005"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
239 |
+is(digest_file($file, "Foo"), "0005"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
240 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
241 |
if (ord('A') == 193) { # EBCDIC. |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
242 |
- ok(digest_file_hex($file, "Foo"), "f0f0f0f5"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
243 |
- ok(digest_file_base64($file, "Foo"), "8PDw9Q"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
244 |
+ is(digest_file_hex($file, "Foo"), "f0f0f0f5"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
245 |
+ is(digest_file_base64($file, "Foo"), "8PDw9Q"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
246 |
} else { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
247 |
- ok(digest_file_hex($file, "Foo"), "30303035"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
248 |
- ok(digest_file_base64($file, "Foo"), "MDAwNQ"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
249 |
+ is(digest_file_hex($file, "Foo"), "30303035"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
250 |
+ is(digest_file_base64($file, "Foo"), "MDAwNQ"); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
251 |
} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
252 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
253 |
unlink($file) || warn "Can't unlink '$file': $!"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
254 |
|
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
255 |
-ok(eval { digest_file("not-there.txt", "Foo") }, undef); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
256 |
-ok($@); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
257 |
+ok !eval { digest_file("not-there.txt", "Foo") }; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
258 |
+ok $@; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
259 |
diff -Naur perl-5.12.4/cpan/Digest/t/lib/Digest/Dummy.pm new/cpan/Digest/t/lib/Digest/Dummy.pm |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
260 |
--- perl-5.12.4/cpan/Digest/t/lib/Digest/Dummy.pm 1969-12-31 16:00:00.000000000 -0800 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
261 |
+++ new/cpan/Digest/t/lib/Digest/Dummy.pm 2012-04-09 14:20:52.091220603 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
262 |
@@ -0,0 +1,20 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
263 |
+package Digest::Dummy; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
264 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
265 |
+use strict; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
266 |
+use vars qw($VERSION @ISA); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
267 |
+$VERSION = 1; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
268 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
269 |
+require Digest::base; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
270 |
+@ISA = qw(Digest::base); |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
271 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
272 |
+sub new { |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
273 |
+ my $class = shift; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
274 |
+ my $d = shift || "ooo"; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
275 |
+ bless { d => $d }, $class; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
276 |
+} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
277 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
278 |
+sub add {} |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
279 |
+sub digest { shift->{d} } |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
280 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
281 |
+1; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
282 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
283 |
diff -Naur perl-5.12.4/cpan/Digest/t/security.t new/cpan/Digest/t/security.t |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
284 |
--- perl-5.12.4/cpan/Digest/t/security.t 1969-12-31 16:00:00.000000000 -0800 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
285 |
+++ new/cpan/Digest/t/security.t 2012-04-09 14:20:52.126914007 -0700 |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
286 |
@@ -0,0 +1,14 @@ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
287 |
+#!/usr/bin/env perl |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
288 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
289 |
+# Digest->new() had an exploitable eval |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
290 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
291 |
+use strict; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
292 |
+use warnings; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
293 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
294 |
+use Test::More tests => 1; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
295 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
296 |
+use Digest; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
297 |
+ |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
298 |
+$LOL::PWNED = 0; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
299 |
+eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) }; |
e77c012d95e9
7125218 Problem with utility/perl
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
300 |
+is $LOL::PWNED, 0; |
2288
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
301 |
--- perl-5.12.4/patchlevel.h Mo jun 4 16:58:05 2012 |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
302 |
+++ perl-5.12.4/patchlevel.h Mo jun 4 16:58:23 2012 |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
303 |
@@ -132,6 +132,7 @@ |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
304 |
#endif |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
305 |
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
306 |
,"7111771 Problem with utility/perl" |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
307 |
+ ,"7125218 Problem with utility/perl" |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
308 |
,NULL |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
309 |
}; |
6e4cb6b2ecfe
7174201 cr 7125218 did not change patchlevel.h
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
2287
diff
changeset
|
310 |