diff options
| author | Justus Winter <justus@g10code.com> | 2017-05-31 14:33:45 +0200 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2017-06-01 12:09:43 +0200 |
| commit | 8a012280e0f0a462c094d106355aa436fceb1b76 (patch) | |
| tree | 894f6e525cbe50c8cc121a46069f213f58f0e6b5 /g10/options.h | |
| parent | gpg: Fix compliance computation. (diff) | |
| download | gnupg2-8a012280e0f0a462c094d106355aa436fceb1b76.tar.xz gnupg2-8a012280e0f0a462c094d106355aa436fceb1b76.zip | |
gpg,common: Move the compliance framework.
* common/Makefile.am (common_sources): Add new files.
* common/compliance.c: New file. Move 'gnupg_pk_is_compliant' here,
and tweak it to not rely on types private to gpg.
* common/compliance.h: New file. Move the compliance enum here.
* g10/keylist.c (print_compliance_flags): Adapt callsite.
* g10/main.h (gnupg_pk_is_compliant): Remove prototype.
* g10/misc.c (gnupg_pk_is_compliant): Remove function.
* g10/options.h (opt): Use the new compliance enum.
* sm/keylist.c (print_compliance_flags): Use the common functions.
Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'g10/options.h')
| -rw-r--r-- | g10/options.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/g10/options.h b/g10/options.h index c634f0ffd..8d1d93e3d 100644 --- a/g10/options.h +++ b/g10/options.h @@ -28,6 +28,7 @@ #include "packet.h" #include "tofu.h" #include "../common/session-env.h" +#include "../common/compliance.h" #ifndef EXTERN_UNLESS_MAIN_MODULE /* Norcraft can't cope with common symbols */ @@ -139,11 +140,7 @@ struct } trust_model; enum tofu_policy tofu_default_policy; int force_ownertrust; - enum - { - CO_GNUPG, CO_RFC4880, CO_RFC2440, - CO_PGP6, CO_PGP7, CO_PGP8, CO_DE_VS - } compliance; + enum gnupg_compliance_mode compliance; enum { KF_DEFAULT, KF_NONE, KF_SHORT, KF_LONG, KF_0xSHORT, KF_0xLONG |