diff options
author | Justus Winter <justus@g10code.com> | 2017-06-07 12:33:36 +0200 |
---|---|---|
committer | Justus Winter <justus@g10code.com> | 2017-06-07 16:53:32 +0200 |
commit | f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc (patch) | |
tree | 917ac3ec9b7994e2c916fe65970dfb281eabb4f4 /g10/encrypt.c | |
parent | common,gpg,sm: Move the compliance option parser. (diff) | |
download | gnupg2-f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc.tar.xz gnupg2-f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc.zip |
common,gpg: Move the compliance option printer.
* common/compliance.c (gnupg_compliance_option_string): New function.
* common/compliance.h (gnupg_compliance_option_string): New prototype.
* g10/encrypt.c (write_pubkey_enc_from_list): Update callsite.
* g10/gpg.c (main): Likewise.
* g10/keyedit.c (keyedit_menu): Likewise.
* g10/pkclist.c (build_pk_list): Likewise.
* g10/main.h (compliance_option_string): Remove prototype.
* g10/misc.c (compliance_option_string): Remove function.
GnuPG-bug-id: 3191
Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'g10/encrypt.c')
-rw-r--r-- | g10/encrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 57ac8ad66..66f49f4a0 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -932,7 +932,7 @@ write_pubkey_enc_from_list (ctrl_t ctrl, PK_LIST pk_list, DEK *dek, iobuf_t out) if (opt.throw_keyids && (PGP6 || PGP7 || PGP8)) { log_info(_("you may not use %s while in %s mode\n"), - "--throw-keyids",compliance_option_string()); + "--throw-keyids", gnupg_compliance_option_string (opt.compliance)); compliance_failure(); } |