Add options to whitelist #10
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Follow https://www.qubes-os.org/doc/coding-style/ No functional change, diff -w is empty.
Whitelist options: -R --hidden-encrypt-to --try-secret-key --try-all-secrets --skip-hidden-recipients --no-skip-hidden-recipients Fixes QubesOS/qubes-issues#2939
eduncan911
approved these changes
Jul 25, 2017
src/gpg-common.h
Outdated
| @@ -213,6 +224,7 @@ static const struct option gpg_long_options[] = { | |||
| {"no-force-v4-certs", 0, 0, opt_no_force_v4_certs}, | |||
| {"no-greeting", 0, 0, opt_no_greeting}, | |||
| {"no-secmem-warning", 0, 0, opt_no_secmem_warning}, | |||
| {"no-skip-hidden-recipients", 0, 0, opt_no_skip_hidden_recipients}, | |||
There was a problem hiding this comment.
Could we add {"no-throw-keyids", 0, 0, opt_no_throw_keyids},
src/gpg-common.h
Outdated
| @@ -237,11 +249,14 @@ static const struct option gpg_long_options[] = { | |||
| {"s2k-digest-algo", 0, 0, opt_s2k_digest_algo}, | |||
| {"s2k-mode", 0, 0, opt_s2k_mode}, | |||
| {"sign", 0, 0, 's'}, | |||
| {"skip-hidden-recipients", 0, 0, opt_skip_hidden_recipients}, | |||
| {"status-fd", 1, 0, opt_status_fd}, | |||
| {"store", 0, 0, opt_store}, | |||
| {"symmetric", 0, 0, 'c'}, | |||
| {"textmode", 0, 0, 't'}, | |||
| {"trust-model", 1, 0, opt_trust_model}, | |||
There was a problem hiding this comment.
And {"throw-keyids", 0, 0, opt_throw_keyids},
Thanks @eduncan911 for spotting this.
eduncan911
approved these changes
Jul 26, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes QubesOS/qubes-issues#2582
Fixes QubesOS/qubes-issues#2939