# $Id$
#
+use strict;
+
package Verify;
-use DXChannel;
use DXUtil;
use DXDebug;
-use Time::HiRes qw(gettimeofday);
use Digest::SHA1 qw(sha1_base64);
-use strict;
-
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
{
my $class = shift;
my $self = bless {}, ref($class) || $class;
- $self->{seed} = shift if @_;
+ $self->newsalt(@_);
return $self;
}
-sub challenge
+sub newsalt
{
my $self = shift;
- my @t = gettimeofday();
- my $r = unpack("xxNxx", pack("d", rand));
- @t = map {$_ ^ $r} @t;
- dbg("challenge r: $r seed: $t[0] $t[1]" ) if isdbg('verify');
- $r = unpack("xxNxx", pack("d", rand));
- @t = map {$_ ^ $r} @t;
- dbg("challenge r: $r seed: $t[0] $t[1]" ) if isdbg('verify');
- return $self->{seed} = sha1_base64(@t, gettimeofday, rand, rand, rand, @_);
+ return $self->{salt} = sha1_base64('RbG4tST2dYPWnh6bfAaq7pPSL04', @_);
}
-sub response
+sub challenge
{
my $self = shift;
- return sha1_base64($self->{seed}, @_);
+ my $p = substr(sha1_base64($self->{salt}, @_), -6, 6);
+ return $p;
}
sub verify
{
my $self = shift;
my $answer = shift;
- my $p = sha1_base64($self->{seed}, @_);
+ my $p = substr(sha1_base64($self->{salt}, @_), -6, 6);
return $p eq $answer;
}
+sub salt
+{
+ my $self = shift;
+ return @_ ? $self->{salt} = shift : $self->{salt};
+}
1;