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/pkclist.c | |
| 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/pkclist.c')
| -rw-r--r-- | g10/pkclist.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index 05bbea52d..6aec13882 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1022,7 +1022,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list) /* Hidden recipients are not allowed while in PGP mode, issue a warning and switch into GnuPG mode. */ - if ((rov->flags & PK_LIST_HIDDEN) && (PGP6 || PGP7 || PGP8)) + if ((rov->flags & PK_LIST_HIDDEN) && (PGP7 || PGP8)) { log_info(_("option '%s' may not be used in %s mode\n"), "--hidden-recipient", @@ -1073,7 +1073,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list) /* Hidden encrypt-to recipients are not allowed while in PGP mode, issue a warning and switch into GnuPG mode. */ - if ((r->flags&PK_LIST_ENCRYPT_TO) && (PGP6 || PGP7 || PGP8)) + if ((r->flags&PK_LIST_ENCRYPT_TO) && (PGP7 || PGP8)) { log_info(_("option '%s' may not be used in %s mode\n"), "--hidden-encrypt-to", @@ -1370,11 +1370,6 @@ algo_available( preftype_t preftype, int algo, const union pref_hint *hint) { if( preftype == PREFTYPE_SYM ) { - if(PGP6 && (algo != CIPHER_ALGO_IDEA - && algo != CIPHER_ALGO_3DES - && algo != CIPHER_ALGO_CAST5)) - return 0; - if(PGP7 && (algo != CIPHER_ALGO_IDEA && algo != CIPHER_ALGO_3DES && algo != CIPHER_ALGO_CAST5 @@ -1405,9 +1400,9 @@ algo_available( preftype_t preftype, int algo, const union pref_hint *hint) return 0; } - if((PGP6 || PGP7) && (algo != DIGEST_ALGO_MD5 - && algo != DIGEST_ALGO_SHA1 - && algo != DIGEST_ALGO_RMD160)) + if (PGP7 && (algo != DIGEST_ALGO_MD5 + && algo != DIGEST_ALGO_SHA1 + && algo != DIGEST_ALGO_RMD160)) return 0; @@ -1421,8 +1416,8 @@ algo_available( preftype_t preftype, int algo, const union pref_hint *hint) } else if( preftype == PREFTYPE_ZIP ) { - if((PGP6 || PGP7) && (algo != COMPRESS_ALGO_NONE - && algo != COMPRESS_ALGO_ZIP)) + if (PGP7 && (algo != COMPRESS_ALGO_NONE + && algo != COMPRESS_ALGO_ZIP)) return 0; /* PGP8 supports all the compression algos we do */ |