Skip to content

legacy: move pbkdf2 static method from FlexiKey to Pbkdf2FileMixin#9668

Merged
ThomasWaldmann merged 1 commit into
borgbackup:masterfrom
mr-raj12:legacy-pbkdf2-into-mixin
May 26, 2026
Merged

legacy: move pbkdf2 static method from FlexiKey to Pbkdf2FileMixin#9668
ThomasWaldmann merged 1 commit into
borgbackup:masterfrom
mr-raj12:legacy-pbkdf2-into-mixin

Conversation

@mr-raj12
Copy link
Copy Markdown
Contributor

@mr-raj12 mr-raj12 commented May 26, 2026

Description

Moves pbkdf2 from FlexiKey into Pbkdf2FileMixin. The last piece of PBKDF2 logic now lives entirely in borg.legacy, refs #9556.

As in #9664 (comment), after #9665 dropped the KDF section from benchmark_cmd.py, there was no reason for pbkdf2 to stay on FlexiKey.

  • pbkdf2 static method moves from FlexiKey (crypto/key.py) to Pbkdf2FileMixin (legacy/crypto/key.py)
  • pbkdf2_hmac import removed from crypto/key.py, added to legacy/crypto/key.py
  • Test updated: FlexiKey.pbkdf2(...)LegacyKeyfileKey.pbkdf2(...), FlexiKey removed from import

No logic changes. New key types (CHPOKeyfileKey, AESOCBKeyfileKey, etc.) no longer carry pbkdf2 as they never needed it.

Refs #9556

Checklist

  • PR is against master
  • New code has tests
  • Tests pass
  • Commit message references related issue

@mr-raj12 mr-raj12 force-pushed the legacy-pbkdf2-into-mixin branch from e421b7c to d4f25ac Compare May 26, 2026 11:49
@ThomasWaldmann
Copy link
Copy Markdown
Member

Huh? "Workflow runs completed with no jobs"

@mr-raj12
Copy link
Copy Markdown
Contributor Author

Huh? "Workflow runs completed with no jobs"

No ci triggered I tried with a commit too idk why?

@ThomasWaldmann
Copy link
Copy Markdown
Member

Maybe too much vibe coding on github's side. :-)

@ThomasWaldmann ThomasWaldmann merged commit f348fe9 into borgbackup:master May 26, 2026
@ThomasWaldmann
Copy link
Copy Markdown
Member

Let's see if it runs CI for the merge...

@ThomasWaldmann
Copy link
Copy Markdown
Member

There is some issue with fetching the CodeQL action code. Hopefully that will be resolved soon.

@mr-raj12
Copy link
Copy Markdown
Contributor Author

Maybe too much vibe coding on github's side. :-)

Exactly

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants