Skip to content

Accept ? or ! or % as validity for expired/invalid sigs (see T7547) #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Accept ? or ! or % as validity for expired/invalid sigs (see T7547) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion t/MyTestSpecific.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ sub get_expired_test_sig_params {
);
if ($gnupg->cmp_version($gnupg->version, '2.2') > 0) {
$sig_params{user_id_string} = '';
$sig_params{validity} = '?';
$sig_params{validity} = '?!';
}
else {
$sig_params{user_id_string} = 'Frank J. Tobin <ftobin@neverending.org>',
Expand Down
6 changes: 5 additions & 1 deletion t/get_public_keys.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ TEST
}

my @compared_fields = qw(
validity
algo_num
hex_id
date
Expand All @@ -244,6 +243,11 @@ TEST
foreach my $field ( @compared_fields ) {
return 0 unless $self->$field eq $other->$field;
}
return 0 unless $self->validity eq $other->validity ||
($self->validity eq '?!' &&
($other->validity eq '!' ||
$other->validity eq '?' ||
$other->validity eq '%'));
# check for expiration if present?
return 0 unless (defined $self->expiration_date) == (defined $other->expiration_date);
if (defined $self->expiration_date) {
Expand Down