Skip to content

Handle OpenPGP-compliant CSF message verfication #40

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

Merged
alecpl merged 1 commit into from
Apr 5, 2025
Merged

Handle OpenPGP-compliant CSF message verfication #40

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 tests/DecryptAndVerifyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ public function testDecryptVerifySignedOnlyBadSignature()
// }}}

$results = $this->gpg->decryptAndVerify($clearsignedData);
$this->assertDecryptAndVerifyResultsEquals($expectedResults, $results);
$this->assertDecryptAndVerifyResultsEquals($expectedResults, $results, true);
}

/**
Expand Down
7 changes: 6 additions & 1 deletion tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ protected function getTempFilename($filename)
return __DIR__ . '/' . self::TEMPDIR . '/' . $filename;
}

protected function assertDecryptAndVerifyResultsEquals(array $expected, array $actual)
protected function assertDecryptAndVerifyResultsEquals(array $expected, array $actual, $csf = false)
{
$this->assertEquals(
count($expected),
Expand Down Expand Up @@ -666,6 +666,11 @@ protected function assertDecryptAndVerifyResultsEquals(array $expected, array $a
'Actual result does not include signatures.'
);

if ($csf && (substr($actual['data'], -1) != "\n")) {
// see discussion around GnuPG's handling of trailing
// newlines in CSF messages at https://dev.gnupg.org/T7106
$actual['data'] = $actual['data']."\n";
}
$this->assertEquals(
$expected['data'],
$actual['data'],
Expand Down