/[pdpsoft]/nl.nikhef.pdp.fetchcrl/tags/fetch-crl-3.0.8-1/TrustAnchor.pm
ViewVC logotype

Diff of /nl.nikhef.pdp.fetchcrl/tags/fetch-crl-3.0.8-1/TrustAnchor.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1878 by davidg, Tue Aug 10 07:03:43 2010 UTC revision 1901 by davidg, Mon Aug 30 17:40:34 2010 UTC
# Line 329  sub loadState($$) { Line 329  sub loadState($$) {
329               # are NOT supported for this heuristic               # are NOT supported for this heuristic
330      if ( ! defined $self->{"crl"}[$i]{"state"}{"mtime"} ) {      if ( ! defined $self->{"crl"}[$i]{"state"}{"mtime"} ) {
331        my $mtime;        my $mtime;
332        STATEHUNT: foreach my $output ( @{$::cnf->{_}->{"output_"}} ) {        STATEHUNT: foreach my $output ( ( $::cnf->{_}->{"output"},
333               $::cnf->{_}->{"output_der"}, $::cnf->{_}->{"output_pem"},
334               $::cnf->{_}->{"output_nss"}, $::cnf->{_}->{"output_openssl"}) ) {
335            defined $output and $output or next;
336          foreach my $file (          foreach my $file (
337                $self->{"nametemplate_der"},                $self->{"nametemplate_der"},
338                $self->{"nametemplate_pem"},                $self->{"nametemplate_pem"},
# Line 347  sub loadState($$) { Line 350  sub loadState($$) {
350        $::log->verb(3,"Inferred mtime for",$self->{"alias"},"is",$mtime) if $mtime;        $::log->verb(3,"Inferred mtime for",$self->{"alias"},"is",$mtime) if $mtime;
351        $self->{"crl"}[$i]{"state"}{"mtime"} = $mtime if $mtime;        $self->{"crl"}[$i]{"state"}{"mtime"} = $mtime if $mtime;
352      }      }
353    
354        # as a last resort, set mtime to curren time
355        $self->{"crl"}[$i]{"state"}{"mtime"} ||= time;
356    
357    }    }
358    return 1;    return 1;
359  }  }
# Line 681  sub verifyAndConvertCRLs($) { Line 688  sub verifyAndConvertCRLs($) {
688      if ( ! $crl->getLastUpdate ) {      if ( ! $crl->getLastUpdate ) {
689        push @verifyMessages,"downloaded CRL lastUpdate could not be derived";        push @verifyMessages,"downloaded CRL lastUpdate could not be derived";
690      } elsif ( $oldlastupdate and ($crl->getLastUpdate < $oldlastupdate) and      } elsif ( $oldlastupdate and ($crl->getLastUpdate < $oldlastupdate) and
691           ($self->{"crl"}[$i]{"state"}{"mtime"} < time)           ($self->{"crl"}[$i]{"state"}{"mtime"} <= time)
692         ) {         ) {
693        push @verifyMessages,"downloaded CRL lastUpdate predates installed CRL,",        push @verifyMessages,"downloaded CRL lastUpdate predates installed CRL,",
694                             "and current version has sane timestamp";                             "and current version has sane timestamp";

Legend:
Removed from v.1878  
changed lines
  Added in v.1901

grid.support@nikhef.nl
ViewVC Help
Powered by ViewVC 1.1.28