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 /common | |
| 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 'common')
| -rw-r--r-- | common/compliance.c | 19 | ||||
| -rw-r--r-- | common/compliance.h | 2 |
2 files changed, 21 insertions, 0 deletions
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"); +} diff --git a/common/compliance.h b/common/compliance.h index 198447c6e..9cbcced7b 100644 --- a/common/compliance.h +++ b/common/compliance.h @@ -58,5 +58,7 @@ int gnupg_parse_compliance_option (const char *string, struct gnupg_compliance_option options[], size_t length, int quiet); +const char *gnupg_compliance_option_string (enum gnupg_compliance_mode compliance); + #endif /*GNUPG_COMMON_COMPLIANCE_H*/ |