[stable34] fix(encryption): keep the encrypted version the copy was written with - #64605
Merged
Merged
Conversation
A copy re-encrypts the target, so the signature of its blocks is keyed on the version of the target - the version of the file it overwrites plus one - and not on the version of the source. Two writers overwrite that value after the stream recorded it: updateEncryptedVersion() resets it to 1 for every copy, and Cache::copyFromCache() then puts the source's version on the target. Reading the copy back fails with "Bad Signature" whenever those differ, which is the case for every copy of a file that was written more than once and for every copy onto an existing file. Take the version the stream recorded for the target instead of resetting it, and let it win over the source's version when the cache entry of the copy is written. Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
backportbot
Bot
requested review from
Altahrim,
GhassenKefi,
come-nc,
icewind1991,
provokateurin,
salmart-dev and
susnux
and removed request for
a team
September 20, 2026 22:28
backportbot
Bot
added
bug
3. to review
susnux
approved these changes
Sep 20, 2026
icewind1991
approved these changes
Sep 22, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of PR #64378