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/encrypt.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/encrypt.c')
-rw-r--r-- | g10/encrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 7de07d234..04a9ab214 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -1136,7 +1136,7 @@ write_pubkey_enc (ctrl_t ctrl, static int write_pubkey_enc_from_list (ctrl_t ctrl, PK_LIST pk_list, DEK *dek, iobuf_t out) { - if (opt.throw_keyids && (PGP6 || PGP7 || PGP8)) + if (opt.throw_keyids && (PGP7 || PGP8)) { log_info(_("option '%s' may not be used in %s mode\n"), "--throw-keyids", |