Skip to content

Also run repair steps when encryption is disabled but a legacy key is present - #24409

Merged
MorrisJobke merged 1 commit into
masterfrom
bugfix/24399
Dec 3, 2020
Merged

Also run repair steps when encryption is disabled but a legacy key is present#24409
MorrisJobke merged 1 commit into
masterfrom
bugfix/24399

Conversation

@juliusknorr

Copy link
Copy Markdown
Member

The repair steps should also run when there is a legacy master key present in the system but encryption is currently enabled as the encryption would still be needed with the legacy key format then to decrypt files that would still be encrypted.

@juliusknorr

Copy link
Copy Markdown
MemberAuthor

/backport to stable20

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title is misleading 😉

@juliusknorrjuliusknorr changed the title Use proper bundles for files client and fileinfoAlso run repair steps when encryption is disabled but a legacy key is presentNov 27, 2020
@juliusknorr

Copy link
Copy Markdown
MemberAuthor

PR title is misleading

Woops, had the wrong base branch when branching off in the first place, renamed.

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

…old master key is present
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorrjuliusknorr mentioned this pull request Dec 3, 2020
@juliusknorr

Copy link
Copy Markdown
MemberAuthor

Rebased to retrigger ci

@juliusknorrjuliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 3, 2020
@MorrisJobke
MorrisJobke merged commit d7207d8 into masterDec 3, 2020
@MorrisJobke
MorrisJobke deleted the bugfix/24399 branch December 3, 2020 09:54
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@juliusknorr@ChristophWurst@blizzz@MorrisJobke