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.
Status
Ready for review
Description of Changes
Fixes #5579.
Adds
--yes
to gnupg options when deleting source keypairs.This is the smallest fix, but I also experimented with adding
--yes
to the options ofCryptoUtil.gpg
and dispensing with the specialGPG
instance used indelete_keys
, and that works too -- on Focal. On Xenial, with gpg 2.1.11,--pinentry-mode loopback
still breaks key deletion.I read through the mailing list thread linked in the comment in
delete_keys
and I'm not sure it's still relevant as of gpg 2.2.19, which is what we have on Focal.So when we drop Xenial, we should be able to drop the extra GPG object too.
Testing
Follow STR from #5579. The source keys should be deleted.
Checklist
If you made changes to the server application code:
make lint
) and tests (make test
) pass in the development containerIf you made non-trivial code changes: