diff options
| author | Justus Winter <[email protected]> | 2017-06-07 10:33:36 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-06-07 14:53:32 +0000 |
| commit | f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc (patch) | |
| tree | 917ac3ec9b7994e2c916fe65970dfb281eabb4f4 /g10/gpg.c | |
| parent | common,gpg,sm: Move the compliance option parser. (diff) | |
| download | gnupg-f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -3843,17 +3843,17 @@ main (int argc, char **argv) case PREFTYPE_SYM: log_info(_("you may not use cipher algorithm '%s'" " while in %s mode\n"), - badalg,compliance_option_string()); + badalg, gnupg_compliance_option_string (opt.compliance)); break; case PREFTYPE_HASH: log_info(_("you may not use digest algorithm '%s'" " while in %s mode\n"), - badalg,compliance_option_string()); + badalg, gnupg_compliance_option_string (opt.compliance)); break; case PREFTYPE_ZIP: log_info(_("you may not use compression algorithm '%s'" " while in %s mode\n"), - badalg,compliance_option_string()); + badalg, gnupg_compliance_option_string (opt.compliance)); break; default: BUG(); @@ -4072,7 +4072,8 @@ main (int argc, char **argv) " with --s2k-mode 0\n")); else if(PGP6 || PGP7) log_error(_("you cannot use --symmetric --encrypt" - " while in %s mode\n"),compliance_option_string()); + " while in %s mode\n"), + gnupg_compliance_option_string (opt.compliance)); else { if( (rc = encrypt_crypt (ctrl, -1, fname, remusr, 1, NULL, -1)) ) @@ -4132,7 +4133,8 @@ main (int argc, char **argv) " with --s2k-mode 0\n")); else if(PGP6 || PGP7) log_error(_("you cannot use --symmetric --sign --encrypt" - " while in %s mode\n"),compliance_option_string()); + " while in %s mode\n"), + gnupg_compliance_option_string (opt.compliance)); else { if( argc ) |