security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

* misc.c (compliance_option_string, compliance_failure): Minor

Browse Source 
cleanup.

* armor.c (is_armor_header): Comment about 4880.
This commit is contained in:
David Shaw 2007-10-21 16:07:13 +00:00
parent 1ce132213e
commit f3abec2002
3 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2007-10-21 David Shaw <dshaw@jabberwocky.com>
* misc.c (compliance_option_string, compliance_failure): Minor
cleanup.
* armor.c (is_armor_header): Comment about 4880.
2007-10-17 David Shaw <dshaw@jabberwocky.com> 2007-10-17 David Shaw <dshaw@jabberwocky.com>
* options.h, gpg.c (main), misc.c (compliance_option_string): Add * options.h, gpg.c (main), misc.c (compliance_option_string): Add

3
g10/armor.c
View File

@ -356,7 +356,8 @@ is_armor_header( byte *line, unsigned len )
--rfc2440 is set since 2440 reads "The header lines, therefore, --rfc2440 is set since 2440 reads "The header lines, therefore,
MUST start at the beginning of a line, and MUST NOT have text MUST start at the beginning of a line, and MUST NOT have text
following them on the same line." It is unclear whether "text" following them on the same line." It is unclear whether "text"
refers to all text or just non-whitespace text. */ refers to all text or just non-whitespace text. 4880 clarified
this was only non-whitespace text. */
if(RFC2440) if(RFC2440)
{ {

85
g10/misc.c
View File

@ -799,51 +799,64 @@ default_compress_algo(void)
const char * const char *
compliance_option_string(void) compliance_option_string(void)
{ {
char *ver="???";
switch(opt.compliance) switch(opt.compliance)
{ {
case CO_RFC4880: case CO_GNUPG: return "--gnupg";
return "--openpgp"; case CO_RFC4880: return "--openpgp";
case CO_RFC2440: case CO_RFC2440: return "--rfc2440";
return "--rfc2440"; case CO_RFC1991: return "--rfc1991";
case CO_RFC1991: case CO_PGP2: return "--pgp2";
return "--rfc1991"; case CO_PGP6: return "--pgp6";
case CO_PGP2: case CO_PGP7: return "--pgp7";
return "--pgp2"; case CO_PGP8: return "--pgp8";
case CO_PGP6:
return "--pgp6";
case CO_PGP7:
return "--pgp7";
case CO_PGP8:
return "--pgp8";
default:
return "???";
}
} }
static const char * return ver;
compliance_string(void)
{
switch(opt.compliance)
{
case CO_RFC2440:
return "OpenPGP";
case CO_PGP2:
return "PGP 2.x";
case CO_PGP6:
return "PGP 6.x";
case CO_PGP7:
return "PGP 7.x";
case CO_PGP8:
return "PGP 8.x";
default:
return "???";
}
} }
void void
compliance_failure(void) compliance_failure(void)
{ {
log_info(_("this message may not be usable by %s\n"),compliance_string()); char *ver="???";
switch(opt.compliance)
{
case CO_GNUPG:
ver="GnuPG";
break;
case CO_RFC4880:
ver="OpenPGP";
break;
case CO_RFC2440:
ver="OpenPGP (older)";
break;
case CO_RFC1991:
ver="old PGP";
break;
case CO_PGP2:
ver="PGP 2.x";
break;
case CO_PGP6:
ver="PGP 6.x";
break;
case CO_PGP7:
ver="PGP 7.x";
break;
case CO_PGP8:
ver="PGP 8.x";
break;
}
log_info(_("this message may not be usable by %s\n"),ver);
opt.compliance=CO_GNUPG; opt.compliance=CO_GNUPG;
} }