diff options
| -rw-r--r-- | common/compliance.c | 19 | ||||
| -rw-r--r-- | common/compliance.h | 2 | ||||
| -rw-r--r-- | g10/encrypt.c | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 12 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 | ||||
| -rw-r--r-- | g10/main.h | 1 | ||||
| -rw-r--r-- | g10/misc.c | 18 | ||||
| -rw-r--r-- | g10/pkclist.c | 4 |
8 files changed, 32 insertions, 28 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*/ 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(); } @@ -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 ) diff --git a/g10/keyedit.c b/g10/keyedit.c index ba08d88c3..9f6add1bc 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -2314,7 +2314,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr, if (RFC2440) { tty_printf (_("This command is not allowed while in %s mode.\n"), - compliance_option_string ()); + gnupg_compliance_option_string (opt.compliance)); break; } photo = 1; diff --git a/g10/main.h b/g10/main.h index c406113df..33116d2ef 100644 --- a/g10/main.h +++ b/g10/main.h @@ -155,7 +155,6 @@ int string_to_compress_algo(const char *string); int check_compress_algo(int algo); int default_cipher_algo(void); int default_compress_algo(void); -const char *compliance_option_string(void); void compliance_failure(void); struct parse_options diff --git a/g10/misc.c b/g10/misc.c index d485c9445..77c8f269c 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -1242,24 +1242,6 @@ default_compress_algo(void) return DEFAULT_COMPRESS_ALGO; } -const char * -compliance_option_string(void) -{ - char *ver="???"; - - switch(opt.compliance) - { - case CO_GNUPG: return "--gnupg"; - case CO_RFC4880: return "--openpgp"; - case CO_RFC2440: return "--rfc2440"; - case CO_PGP6: return "--pgp6"; - case CO_PGP7: return "--pgp7"; - case CO_PGP8: return "--pgp8"; - case CO_DE_VS: return "--compliance=de-vs"; - } - - return ver; -} void compliance_failure(void) diff --git a/g10/pkclist.c b/g10/pkclist.c index ab024d9f2..48cfe4548 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1028,7 +1028,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list) { log_info(_("you may not use %s while in %s mode\n"), "--hidden-recipient", - compliance_option_string()); + gnupg_compliance_option_string (opt.compliance)); compliance_failure(); } @@ -1079,7 +1079,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list) { log_info(_("you may not use %s while in %s mode\n"), "--hidden-encrypt-to", - compliance_option_string()); + gnupg_compliance_option_string (opt.compliance)); compliance_failure(); } |