Changeset 3405394 for perl/lib/Net/XMPP

Timestamp:

Nov 11, 2006, 3:03:56 AM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

51c57f8

Parents:

005562f

Message:

Protocol.pm: allow IQ Auth to take a password callback like SASL's.

File:

• perl/lib/Net/XMPP/Protocol.pm (modified) (4 diffs)

perl/lib/Net/XMPP/Protocol.pm

@@ -1831 +1831 @@
     delete($args{digest});
     delete($args{type});
+    my $password = delete $args{password};
+    if (ref($password) eq 'CODE')
+    {
+        $password = $password->();
+    }
 
     #--------------------------------------------------------------------------
@@ -1844 +1849 @@
     if ($authType eq "zerok")
     {
-        my $hashA = Digest::SHA1::sha1_hex(delete($args{password}));
+        my $hashA = Digest::SHA1::sha1_hex($password);
         $args{hash} = Digest::SHA1::sha1_hex($hashA.$token);
 
@@ -1863 +1868 @@
     if ($authType eq "digest")
     {
-        my $password = delete($args{password});
         $args{digest} = Digest::SHA1::sha1_hex($self->GetStreamID().$password);
     }
@@ -1885 +1889 @@
     # return "".  If no then return error string from the reply.
     #--------------------------------------------------------------------------
+    $password =~ tr/\0-\377/x/;
     return unless defined($iqLogin);
     return ( $iqLogin->GetErrorCode() , $iqLogin->GetError() )