security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-14 21:47:19 +02:00
Code Activity

* sign.c (sign_file): Fix bug that causes spurious compression preference

Browse source 
warning.

* sign.c (clearsign_file): Fix bug that prevents proper warning message
from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key.

* main.h, misc.c (compliance_option_string, compliance_string,
compliance_failure), sign.c (sign_file, clearsign_file), encode.c
(encode_crypt, write_pubkey_enc_from_list): New functions to put the "this
message may not be usable...." warning in one place.

* options.h, g10.c (main): Part two of the simplification.  Use a single
enum to indicate what we are compliant to (1991, 2440, PGPx, etc.)
This commit is contained in:
David Shaw 2003-05-02 21:41:43 +00:00
parent 37ec8572e8
commit 5d283fdd8b
7 changed files with 180 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

23
g10/options.h
View file

@ -90,13 +90,10 @@ struct {
int compress_keys;
int compress_sigs;
int always_trust;
/* TODO: change these to an emulate_pgp variable */
int xpgp2;
int xpgp6;
int xpgp7;
int xpgp8;
int xrfc1991;
int xrfc2440;
enum
{
CO_GNUPG=0, CO_RFC2440, CO_RFC1991, CO_PGP2, CO_PGP6, CO_PGP7, CO_PGP8
} compliance;
int pgp2_workarounds;
unsigned int emulate_bugs; /* bug emulation flags EMUBUG_xxxx */
int shm_coprocess;
@ -207,11 +204,11 @@ struct {
#define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
#define DBG_EXTPROG (opt.debug & DBG_EXTPROG_VALUE)
#define RFC1991 (opt.xrfc1991)
#define RFC2440 (opt.xrfc2440)
#define PGP2 (opt.xpgp2)
#define PGP6 (opt.xpgp6)
#define PGP7 (opt.xpgp7)
#define PGP8 (opt.xpgp8)
#define RFC1991 (opt.compliance==CO_RFC1991 || opt.compliance==CO_PGP2)
#define RFC2440 (opt.compliance==CO_RFC2440)
#define PGP2 (opt.compliance==CO_PGP2)
#define PGP6 (opt.compliance==CO_PGP6)
#define PGP7 (opt.compliance==CO_PGP7)
#define PGP8 (opt.compliance==CO_PGP8)
#endif /*G10_OPTIONS_H*/