Changeset ea0c453

Timestamp:

Sep 12, 2012, 7:53:56 PM (12 years ago)

Author:

Adam Glasgall <adam@crossproduct.net>

Branches:

master, release-1.10, release-1.9

Children:

96ee74c

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 pull request #100 from davidben/master

Use Digest::SHA in Jabber module instead of Digest::SHA1, since Digest::SHA1 has been abandoned and removed from distributions.

Files:

• README (modified) (1 diff)
• perl/modules/Jabber/lib/Net/Jabber/Component.pm (modified) (1 diff)
• perl/modules/Jabber/lib/Net/Jabber/Key.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/Net/XMPP.pm (modified) (1 diff)
• perl/modules/Jabber/lib/Net/XMPP/Protocol.pm (modified) (2 diffs)

README

@@ -40 +40 @@
 Authen::SASL::Perl
 IO::Socket::SSL
-Digest::SHA1
+Digest::SHA
 
 The Twitter module requires:

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

@@ -220 +220 @@
     $self->{STREAM}->SetCallBacks(node=>undef);
 
-    $self->Send("<handshake>".Digest::SHA1::sha1_hex($self->{SESSION}->{id}.$args{secret})."</handshake>");
+    $self->Send("<handshake>".Digest::SHA::sha1_hex($self->{SESSION}->{id}.$args{secret})."</handshake>");
     my $handshake = $self->Process();
 

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;

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

@@ -213 +213 @@
 use Time::Local;
 use Carp;
-use Digest::SHA1;
+use Digest::SHA;
 use Authen::SASL;
 use MIME::Base64;

perl/modules/Jabber/lib/Net/XMPP/Protocol.pm

@@ -1849 +1849 @@
     if ($authType eq "zerok")
     {
-        my $hashA = Digest::SHA1::sha1_hex($password);
-        $args{hash} = Digest::SHA1::sha1_hex($hashA.$token);
+        my $hashA = Digest::SHA::sha1_hex($password);
+        $args{hash} = Digest::SHA::sha1_hex($hashA.$token);
 
         for (1..$sequence)
         {
-            $args{hash} = Digest::SHA1::sha1_hex($args{hash});
+            $args{hash} = Digest::SHA::sha1_hex($args{hash});
         }
     }
@@ -1868 +1868 @@
     if ($authType eq "digest")
     {
-        $args{digest} = Digest::SHA1::sha1_hex($self->GetStreamID().$password);
+        $args{digest} = Digest::SHA::sha1_hex($self->GetStreamID().$password);
     }