X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FVerify.pm;h=5e0fffe1d7e38e3a38927d23caf5f09b262b5a1d;hb=6f20114b034d329c1e2a4f91f0aba2f6ec4002d4;hp=58694eb5d1e7be6837ea21c90bf098357830b884;hpb=72dc0f2eeecaf78902acacb9d183b7f9215dd385;p=spider.git

diff --git a/perl/Verify.pm b/perl/Verify.pm
index 58694eb5..5e0fffe1 100644
--- a/perl/Verify.pm
+++ b/perl/Verify.pm
@@ -7,16 +7,14 @@
 # $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));
@@ -27,35 +25,48 @@ sub new
 {
 	my $class = shift;
 	my $self = bless {}, ref($class) || $class; 
-	$self->{seed} = shift if @_;
+	if (@_) {
+		$self->newseed(@_);
+		$self->newsalt;
+	}
 	return $self;
 }
 
-sub challenge
+sub newseed
 {
 	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->{seed} = sha1_base64('RbG4tST2dYPWnh6bfAaq7pPSL04', @_);
 }
 
-sub response
+sub newsalt
 {
 	my $self = shift;
-	return sha1_base64($self->{seed}, @_);
+	return $self->{salt} = substr sha1_base64($self->{seed}, rand, rand, rand), 0, 6;
+}
+
+sub challenge
+{
+	my $self = shift;
+	return $self->{salt} . sha1_base64($self->{salt}, $self->{seed}, @_);
 }
 
 sub verify
 {
 	my $self = shift;
 	my $answer = shift;
-	my $p = sha1_base64($self->{seed}, @_);
+	my $p = sha1_base64($self->{salt}, $self->{seed}, @_);
 	return $p eq $answer;
 }
 
+sub seed
+{
+	my $self = shift;
+	return @_ ? $self->{seed} = shift : $self->{seed};
+}
+
+sub salt
+{
+	my $self = shift;
+	return @_ ? $self->{salt} = shift : $self->{salt};
+}
 1;