diff options
| author | Werner Koch <[email protected]> | 2014-08-12 08:36:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-08-14 09:03:55 +0000 |
| commit | 2b8d8369d59249b89526c18c5ac276e6445dc35e (patch) | |
| tree | cee8f7b5adb668e0893ab13812c571db329b119b /g10/options.h | |
| parent | build: Fix autogen.sh base version hack. (diff) | |
| download | gnupg-2b8d8369d59249b89526c18c5ac276e6445dc35e.tar.gz gnupg-2b8d8369d59249b89526c18c5ac276e6445dc35e.zip | |
gpg: Remove options --pgp2 and --rfc1991.
* g10/gpg.c (oRFC1991, oPGP2): Remove
(opts): Remove --pgp2 and --rfc1991.
* g10/options.h (CO_PGP2, CO_RFC1991): Remove. Remove all users.
(RFC2440, PGP2): Remove. Remove all code only enabled by these
conditions.
* tests/openpgp/clearsig.test: Remove --rfc1991 test.
--
The use of PGP 2.c is considered insecure for quite some time
now (e.g. due to the use of MD5). Thus we remove all support for
_creating_ PGP 2 compatible messages.
Diffstat (limited to '')
| -rw-r--r-- | g10/options.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/g10/options.h b/g10/options.h index e407aa400..7efb3d6e6 100644 --- a/g10/options.h +++ b/g10/options.h @@ -121,7 +121,7 @@ struct int force_ownertrust; enum { - CO_GNUPG, CO_RFC4880, CO_RFC2440, CO_RFC1991, CO_PGP2, + CO_GNUPG, CO_RFC4880, CO_RFC2440, CO_PGP6, CO_PGP7, CO_PGP8 } compliance; enum @@ -307,14 +307,12 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; /* Compatibility flags. */ #define GNUPG (opt.compliance==CO_GNUPG) -#define RFC1991 (opt.compliance==CO_RFC1991 || opt.compliance==CO_PGP2) #define RFC2440 (opt.compliance==CO_RFC2440) #define RFC4880 (opt.compliance==CO_RFC4880) -#define PGP2 (opt.compliance==CO_PGP2) #define PGP6 (opt.compliance==CO_PGP6) #define PGP7 (opt.compliance==CO_PGP7) #define PGP8 (opt.compliance==CO_PGP8) -#define PGPX (PGP2 || PGP6 || PGP7 || PGP8) +#define PGPX (PGP6 || 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 |