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/getkey.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/getkey.c')
| -rw-r--r-- | g10/getkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index fe6483592..b111376c9 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -3474,7 +3474,7 @@ merge_selfsigs (ctrl_t ctrl, kbnode_t keyblock) * * In case the primary key is not required, select a suitable subkey. * We need the primary key if PUBKEY_USAGE_CERT is set in REQ_USAGE or - * we are in PGP6 or PGP7 mode and PUBKEY_USAGE_SIG is set in + * we are in PGP7 mode and PUBKEY_USAGE_SIG is set in * REQ_USAGE. * * If any of PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC and PUBKEY_USAGE_CERT @@ -3536,10 +3536,10 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact, req_usage &= USAGE_MASK; /* Request the primary if we're certifying another key, and also if - * signing data while --pgp6 or --pgp7 is on since pgp 6 and 7 do + * signing data while --pgp7 is on since pgp 7 do * not understand signatures made by a signing subkey. PGP 8 does. */ req_prim = ((req_usage & PUBKEY_USAGE_CERT) - || ((PGP6 || PGP7) && (req_usage & PUBKEY_USAGE_SIG))); + || (PGP7 && (req_usage & PUBKEY_USAGE_SIG))); log_assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY); |