--- Crypt-GPG-1.40.orig/GPG.pm	Wed Oct  2 11:38:59 2002
+++ Crypt-GPG-1.40.drhfix/GPG.pm	Wed Oct  2 11:43:03 2002
@@ -167,14 +167,13 @@
   close $tmpfh2; unlink ($tmpnam2);
 
   return ($plaintext) 
-    unless $info =~ /.*Signature\ made\ ((?:\S+\s+){6})
+    unless $info =~ /.*Signature\ made\ ((?:\S+\s+){6,7})
                      using\ \S+\ key\ ID\ (\S+)
 	             \s*gpg:\ (Good|BAD)\ signature\ from/sx;
 
   my $signature = {'Validity' => $3, 'KeyID' => $2, 
 		   'Time' => $1, 'Trusted' => $trusted};
-  $signature->{Time} =~ s/\S+\s*$//; 
-  $signature->{Time} = str2time ($signature->{Time}, $1); 
+  $signature->{Time} = str2time ($signature->{Time}); 
   bless $signature, 'Crypt::GPG::Signature';
   return ($plaintext, $signature);
 }
@@ -773,7 +772,8 @@
 sub AUTOLOAD {
   my $self = shift; (my $auto = $AUTOLOAD) =~ s/.*:://;
   if ($auto =~ /^(validity|keyid|time|trusted)$/) {
-    return $self->{"\U$auto"};
+    return $self->{"KeyID"} if ( $auto eq "keyid" );
+    return $self->{"\u$auto"};
   }
   elsif ($auto eq 'DESTROY') {
   }