Skip to content

Prepare non secret transcrypt config#210

Merged
jmurty merged 1 commit into
elasticdog:transcrypt-v3from
Erotemic:dev/prepare_state_reader
May 27, 2026
Merged

Prepare non secret transcrypt config#210
jmurty merged 1 commit into
elasticdog:transcrypt-v3from
Erotemic:dev/prepare_state_reader

Conversation

@Erotemic
Copy link
Copy Markdown

This PR adds the non-secret configuration needed for the v3/PBKDF2 work without changing current behavior.

With this change transcrypt will read settings from .transcrypt/config, but it will only accept a configuration that matches the current v2 settings. I.e.

[transcrypt]
format = legacy
cipher = aes-256-cbc
digest = MD5
kdf = legacy

We do not yet write .transcrypt/config on init, this PR just reads it if it is there and validates the settings.

It does display the settings with transcrypt --display

@jmurty
Copy link
Copy Markdown
Collaborator

jmurty commented May 27, 2026

This is looking good thanks @Erotemic. I've applied a couple of tweaks to get the tests to pass.

Can you change the target branch to transcrypt-v3? I'll merge this PR to there. I want to keep the v3 work out of main for now in case transcrypt needs a bug fix release.

@Erotemic Erotemic changed the base branch from main to transcrypt-v3 May 27, 2026 13:36
@Erotemic
Copy link
Copy Markdown
Author

Whoops, not sure how the sensitive file got modified. I was having issues with the repo state. Thanks for fixing that.

WRT to a bug fix release, there is an issue, which probably caused the sensitive file problem. I have a different default git merge config, and that - as well as the pbkdf2 output message - is messing with the smudge filters. I have the fix set aside in a standalone branch, but earlier there was discussion about not hiding the pbkdf2 warnings, and forcing the merge option for the repo seemed questionable. I wanted to think more about if it was worth merging or not, but its been over a week and I haven't come to an epiphany about it yet, so maybe I'll just push it up for discussion here? I need to prepare a MWE to demonstrate it though. Might not get to it today, but I wanted to flag that.

@jmurty
Copy link
Copy Markdown
Collaborator

jmurty commented May 27, 2026 via email

Validate cipher read from public settings file. Mainly to fix `shellcheck` linting error.

Co-authored-by: James Murty <james@murty.com>"
@Erotemic Erotemic force-pushed the dev/prepare_state_reader branch from 66c7d35 to ccb3d13 Compare May 27, 2026 16:30
@Erotemic
Copy link
Copy Markdown
Author

I force pushed this branch to squash the 3 commits so merging it wouldn't add unnecessary diff bloat.

@Erotemic
Copy link
Copy Markdown
Author

Erotemic commented May 27, 2026

I think I may have been mistaken on the merge issue. I think the problem was I have a different global merge driver "diff3" and the test expects the default "merge", so its just that the test isn't robust to user global config, but nothing seems wrong with transcrypt itself. I also can't reproduce the issue I thought I saw with pbkdf2 causing smudge issues, so it might have been an unrelated dirty state. In any case, I'll push on the small PRs for v3 after this one lands.

@jmurty jmurty merged commit 58b2e38 into elasticdog:transcrypt-v3 May 27, 2026
7 checks passed
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