diff options
| author | Werner Koch <[email protected]> | 2018-05-29 11:01:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-05-29 11:01:12 +0000 |
| commit | b2c05d691247a79fb46f75b653cbc4bf518c1c2a (patch) | |
| tree | 6fcc63be06b9def155c5cf4eee9d4f860f3b541b /g10/options.h | |
| parent | doc: Add a hint about gpgsm and DECRYPTION_INFO. (diff) | |
| download | gnupg-b2c05d691247a79fb46f75b653cbc4bf518c1c2a.tar.gz gnupg-b2c05d691247a79fb46f75b653cbc4bf518c1c2a.zip | |
gpg: Remove PGP6 compliance mode.
* g10/gpg.c: Make --pgp6 an alias for --pgp7.
* common/compliance.h (gnupg_compliance_mode): Remove CO_PGP6.
* g10/options.h (PGP6): Remove. Adjust all users.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/options.h')
| -rw-r--r-- | g10/options.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/g10/options.h b/g10/options.h index 09d4e4435..3754687ae 100644 --- a/g10/options.h +++ b/g10/options.h @@ -340,10 +340,9 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; #define GNUPG (opt.compliance==CO_GNUPG || opt.compliance==CO_DE_VS) #define RFC2440 (opt.compliance==CO_RFC2440) #define RFC4880 (opt.compliance==CO_RFC4880) -#define PGP6 (opt.compliance==CO_PGP6) #define PGP7 (opt.compliance==CO_PGP7) #define PGP8 (opt.compliance==CO_PGP8) -#define PGPX (PGP6 || PGP7 || PGP8) +#define PGPX (PGP7 || PGP8) /* Various option flags. Note that there should be no common string names between the IMPORT_ and EXPORT_ flags as they can be mixed in |