Skip to content
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.

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

Assorted redwood/Sequoia fixes from Neal's review #6998

Merged
merged 3 commits into from Oct 13, 2023

Conversation

legoktm
Copy link
Member

@legoktm legoktm commented Oct 12, 2023

Status

Ready for review

Description of Changes

See individual commit messages for specific details:

  • redwood: Relax requirements for decrypting messages
  • redwood: Correctly check for secret key material
  • redwood: Improve writing of encrypted files
  • redwood: Directly get a key's key ID

Thank you @nwalfield for the review :) This fixes all of the raised issues that I considered to be 2.7.0 blockers except #6986, which I needed more input on.

Testing

How should the reviewer test this PR?

  • Visual review & CI passes

Deployment

Any special considerations for deployment? No

Checklist

  • Linting (make lint) and tests (make test) pass in the development container

@legoktm legoktm requested a review from a team as a code owner October 12, 2023 20:25
@legoktm legoktm force-pushed the sequoia-fixes branch 2 times, most recently from 10a6822 to ebbcefe Compare October 12, 2023 22:52
@nwalfield
Copy link

The changes look good to me!

First, use "create_new" mode when opening the file so if it already
exists, an error will be raised instead of silently truncating the
existing file. This required adjusting our tests a bit since
NamedTempFile creates a file before we try writing to it.

Then use a BufWriter to buffer filesystem writes instead of writing each
byte as it comes in.

Fixes #6989.
Fixes #6990.
We were not checking if any subkeys had secret key material too, which
is_tsk() checks for us.

Fixes #6988.
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

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

CI is passing, external review/approval provided via @nwalfield, visual review looks good! LGTM

@zenmonkeykstop zenmonkeykstop merged commit f3adeba into develop Oct 13, 2023
11 checks passed
@zenmonkeykstop zenmonkeykstop deleted the sequoia-fixes branch October 13, 2023 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants