Skip to content

[stable28] fix: Autodetect legacy filekey instead of trusting the header for legacy header #45777

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
AndyScherzinger merged 3 commits into from
Jun 11, 2024
Merged

[stable28] fix: Autodetect legacy filekey instead of trusting the header for legacy header #45777

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92e053a
fix: Autodetect legacy filekey instead of trusting the header for leg…
come-nc Jun 4, 2024
9026c98
fix: add default value for new flag `$useDecryptAll` on getFileKey
come-nc Jun 6, 2024
71188dc
test: Fix encryption test
artonge Jun 6, 2024
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
Prev Previous commit
Next Next commit
fix: add default value for new flag $useDecryptAll on getFileKey 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Jun 11, 2024
commit 9026c98243a97ea1c9952865cf390d8c2cd56b4e
2 changes: 1 addition & 1 deletion apps/encryption/lib/KeyManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public function getPrivateKey($userId) {
/**
* @param ?bool $useLegacyFileKey null means try both
*/
public function getFileKey(string $path, ?string $uid, ?bool $useLegacyFileKey, bool $useDecryptAll): string {
public function getFileKey(string $path, ?string $uid, ?bool $useLegacyFileKey, bool $useDecryptAll = false): string {
if ($uid === '') {
$uid = null;
}
Expand Down