security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Remove PGP6 compliance mode.

Browse source 
* 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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-05-29 13:01:12 +02:00
parent a042799c86
commit b2c05d6912
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
10 changed files with 25 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/compliance.c
View file

@ -528,7 +528,6 @@ gnupg_status_compliance_flag (enum gnupg_compliance_mode compliance)
return "8";
case CO_RFC4880:
case CO_RFC2440:
case CO_PGP6:
case CO_PGP7:
case CO_PGP8:
log_assert (!"no status code assigned for this compliance mode");
@ -580,7 +579,6 @@ gnupg_compliance_option_string (enum gnupg_compliance_mode compliance)
case CO_GNUPG: return "--compliance=gnupg";
case CO_RFC4880: return "--compliance=openpgp";
case CO_RFC2440: return "--compliance=rfc2440";
case CO_PGP6: return "--compliance=pgp6";
case CO_PGP7: return "--compliance=pgp7";
case CO_PGP8: return "--compliance=pgp8";
case CO_DE_VS: return "--compliance=de-vs";

2
common/compliance.h
View file

@ -39,7 +39,7 @@ void gnupg_initialize_compliance (int gnupg_module_name);
enum gnupg_compliance_mode
{
CO_GNUPG, CO_RFC4880, CO_RFC2440,
CO_PGP6, CO_PGP7, CO_PGP8, CO_DE_VS
CO_PGP7, CO_PGP8, CO_DE_VS
};
enum pk_use_case