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/keygen.c | |
| 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/keygen.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index af5d34d24..ed11a2fff 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -341,16 +341,6 @@ keygen_set_std_prefs (const char *string,int personal) if ( !openpgp_cipher_test_algo (CIPHER_ALGO_CAST5) ) strcat(dummy_string,"S3 "); strcat(dummy_string,"S2 "); /* 3DES */ - /* If we have it, IDEA goes *after* 3DES so it won't be - used unless we're encrypting along with a V3 key. - Ideally, we would only put the S1 preference in if the - key was RSA and <=2048 bits, as that is what won't - break PGP2, but that is difficult with the current - code, and not really worth checking as a non-RSA <=2048 - bit key wouldn't be usable by PGP2 anyway. -dms */ - if (PGP2 && !openpgp_cipher_test_algo (CIPHER_ALGO_IDEA) ) - strcat(dummy_string,"S1 "); - /* The default hash algo order is: SHA-256, SHA-1, SHA-384, SHA-512, SHA-224. |