security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-28 02:12:46 +02:00
Code Activity

* options.h, g10.c (main), textfilter.c (standard): Use --rfc2440 or

Browse Source 
--openpgp directly to determine the end of line hashing rule.

* trustdb.c (uid_trust_string_fixed): Show uids as expired if the key is
expired.
This commit is contained in:
David Shaw 2004-12-11 04:47:33 +00:00
parent 396f72d1b2
commit bf5d013bc8
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2004-12-10 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main), textfilter.c (standard): Use --rfc2440
or --openpgp directly to determine the end of line hashing rule.
* trustdb.c (uid_trust_string_fixed): Show uids as expired if the
key is expired.
2004-12-10 Werner Koch <wk@g10code.com> 2004-12-10 Werner Koch <wk@g10code.com>
* app-openpgp.c (send_fprtime_if_not_null): New. * app-openpgp.c (send_fprtime_if_not_null): New.

2
g10/g10.c
View File

@ -2092,8 +2092,6 @@ main( int argc, char **argv )
opt.escape_from = 1; opt.escape_from = 1;
break; break;
case oRFC2440: case oRFC2440:
opt.strict_2440_line_endings=1;
/* fall through */
case oOpenPGP: case oOpenPGP:
/* TODO: When 2440bis becomes a RFC, these may need /* TODO: When 2440bis becomes a RFC, these may need
changing. */ changing. */

1
g10/options.h
View File

@ -192,7 +192,6 @@ struct
unsigned int screen_columns; unsigned int screen_columns;
unsigned int screen_lines; unsigned int screen_lines;
byte *show_subpackets; byte *show_subpackets;
int strict_2440_line_endings;
#ifdef ENABLE_CARD_SUPPORT #ifdef ENABLE_CARD_SUPPORT
const char *ctapi_driver; /* Library to access the ctAPI. */ const char *ctapi_driver; /* Library to access the ctAPI. */

5
g10/textfilter.c
View File

@ -61,6 +61,7 @@ len_without_trailing_chars( byte *line, unsigned len, const char *trimchars )
return mark? (mark - line) : len; return mark? (mark - line) : len;
} }
static int static int
standard( text_filter_context_t *tfx, IOBUF a, standard( text_filter_context_t *tfx, IOBUF a,
byte *buf, size_t size, size_t *ret_len) byte *buf, size_t size, size_t *ret_len)
@ -104,7 +105,7 @@ standard( text_filter_context_t *tfx, IOBUF a,
behavior (ignoring 2440 itself), so this actually makes us behavior (ignoring 2440 itself), so this actually makes us
compatible with PGP textmode detached signatures for the compatible with PGP textmode detached signatures for the
first time. */ first time. */
if(opt.strict_2440_line_endings) if(RFC2440)
tfx->buffer_len=trim_trailing_chars(tfx->buffer,tfx->buffer_len, tfx->buffer_len=trim_trailing_chars(tfx->buffer,tfx->buffer_len,
" \t\r\n"); " \t\r\n");
else else
@ -121,8 +122,6 @@ standard( text_filter_context_t *tfx, IOBUF a,
} }
/**************** /****************
* The filter is used to make canonical text: Lines are terminated by * The filter is used to make canonical text: Lines are terminated by
* CR, LF, trailing white spaces are removed. * CR, LF, trailing white spaces are removed.

1
g10/trustdb.c
View File

@ -509,6 +509,7 @@ uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid)
switch(get_validity(key,uid)&TRUST_MASK) switch(get_validity(key,uid)&TRUST_MASK)
{ {
case TRUST_UNKNOWN: return _("[ unknown]"); case TRUST_UNKNOWN: return _("[ unknown]");
case TRUST_EXPIRED: return _("[ expired]");
case TRUST_UNDEFINED: return _("[ undef ]"); case TRUST_UNDEFINED: return _("[ undef ]");
case TRUST_MARGINAL: return _("[marginal]"); case TRUST_MARGINAL: return _("[marginal]");
case TRUST_FULLY: return _("[ full ]"); case TRUST_FULLY: return _("[ full ]");