From b2c05d691247a79fb46f75b653cbc4bf518c1c2a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 29 May 2018 13:01:12 +0200 Subject: 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 --- g10/encrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/encrypt.c') 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", -- cgit v1.2.3