From f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 7 Jun 2017 12:33:36 +0200 Subject: 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 --- common/compliance.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'common/compliance.c') diff --git a/common/compliance.c b/common/compliance.c index d81a50385..0acaf2135 100644 --- a/common/compliance.c +++ b/common/compliance.c @@ -243,3 +243,22 @@ gnupg_parse_compliance_option (const char *string, log_info (_ ("(use \"help\" to list choices)\n")); return -1; } + + +/* Return the command line option for the given COMPLIANCE mode. */ +const char * +gnupg_compliance_option_string (enum gnupg_compliance_mode compliance) +{ + switch (compliance) + { + case CO_GNUPG: return "--compliance=gnupg"; + case CO_RFC4880: return "--compliance=openpgp"; + case CO_RFC2440: return "--compliance=rfc2440"; + case CO_PGP6: return "--compliance=pgp6"; + case CO_PGP7: return "--compliance=pgp7"; + case CO_PGP8: return "--compliance=pgp8"; + case CO_DE_VS: return "--compliance=de-vs"; + } + + log_assert (!"invalid compliance mode"); +} -- cgit v1.2.3