Changeset 54d9b42 for perl/modules/Jabber/lib/Net/Jabber/Key.pm

Timestamp:

Sep 9, 2012, 6:30:07 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Parents:

4d9e311c (diff), a8c55b5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge a8c55b5229df5b40e00b717abd7f1f8fa52c18e2 into 4d9e311c006953157914f0491b8904e796ea3f19

File:

• perl/modules/Jabber/lib/Net/Jabber/Key.pm (modified) (2 diffs)

perl/modules/Jabber/lib/Net/Jabber/Key.pm

@@ -104 +104 @@
     $self->{CACHE} = {};
 
-    if (eval "require Digest::SHA1")
+    if (eval "require Digest::SHA")
     {
         $self->{DIGEST} = 1;
-        Digest::SHA1->import(qw(sha1 sha1_hex sha1_base64));
+        Digest::SHA->import(qw(sha1 sha1_hex sha1_base64));
     }
     else
     {
-        print "ERROR:  You cannot use Key.pm unless you have Digest::SHA1 installed.\n";
+        print "ERROR:  You cannot use Key.pm unless you have Digest::SHA installed.\n";
         exit(0);
     }
@@ -132 +132 @@
 
     my $string = $$.time.rand(1000000);
-    $string = Digest::SHA1::sha1_hex($string);
+    $string = Digest::SHA::sha1_hex($string);
     $self->{DEBUG}->Log1("Generate: key($string)");
     return $string;