diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/chk_expiry | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/chk_expiry b/scripts/chk_expiry index 2d6b020..fffbb09 100755 --- a/scripts/chk_expiry +++ b/scripts/chk_expiry @@ -17,12 +17,13 @@ for my $keyring (@{$conf{keyrings}}) { print "============================================================\n"; print "Processing keyring: $keyring\n\n"; for my $line (query_keyring($keyring)) { + chomp($line); my ($key, $y, $m, $d); - unless ($line =~ m![ps]ub\s+\d+[RDg]/ - ([\dABCDEF]{8}) + unless ($line =~ m![ps]ub\s+(?:rsa|dsa|elg|cv|ed)\d+/ + (?:0x)?([\dABCDEF]{16}) \s.+expire[ds]:\s (\d{4})-(\d{2})-(\d{2})!x) { - warn "Unrecognized: $line"; + warn "Unrecognized: «$line»"; next; } ($key, $y, $m, $d) = ($1, $2, $3, $4); |