diff options
| author | David Shaw <[email protected]> | 2004-12-11 04:47:33 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-12-11 04:47:33 +0000 |
| commit | bf5d013bc8de0ec5eaeb14d93da32f5167856f22 (patch) | |
| tree | 342cc235dde9854398075b608a0618ffabd4d513 | |
| parent | * sv.po: Take the update done for 1.2.6. (diff) | |
| download | gnupg-bf5d013bc8de0ec5eaeb14d93da32f5167856f22.tar.gz gnupg-bf5d013bc8de0ec5eaeb14d93da32f5167856f22.zip | |
* 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.
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/g10.c | 2 | ||||
| -rw-r--r-- | g10/options.h | 1 | ||||
| -rw-r--r-- | g10/textfilter.c | 5 | ||||
| -rw-r--r-- | g10/trustdb.c | 1 |
5 files changed, 11 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 4ca4ece66..2a223bb24 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2004-12-10 David Shaw <[email protected]> + + * 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 <[email protected]> * app-openpgp.c (send_fprtime_if_not_null): New. @@ -2092,8 +2092,6 @@ main( int argc, char **argv ) opt.escape_from = 1; break; case oRFC2440: - opt.strict_2440_line_endings=1; - /* fall through */ case oOpenPGP: /* TODO: When 2440bis becomes a RFC, these may need changing. */ diff --git a/g10/options.h b/g10/options.h index 340056c6f..e8463f0e8 100644 --- a/g10/options.h +++ b/g10/options.h @@ -192,7 +192,6 @@ struct unsigned int screen_columns; unsigned int screen_lines; byte *show_subpackets; - int strict_2440_line_endings; #ifdef ENABLE_CARD_SUPPORT const char *ctapi_driver; /* Library to access the ctAPI. */ diff --git a/g10/textfilter.c b/g10/textfilter.c index 16f0d9faa..833cf64d3 100644 --- a/g10/textfilter.c +++ b/g10/textfilter.c @@ -61,6 +61,7 @@ len_without_trailing_chars( byte *line, unsigned len, const char *trimchars ) return mark? (mark - line) : len; } + static int standard( text_filter_context_t *tfx, IOBUF a, 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 compatible with PGP textmode detached signatures for the first time. */ - if(opt.strict_2440_line_endings) + if(RFC2440) tfx->buffer_len=trim_trailing_chars(tfx->buffer,tfx->buffer_len, " \t\r\n"); 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 * CR, LF, trailing white spaces are removed. diff --git a/g10/trustdb.c b/g10/trustdb.c index 62c49c46d..1222f49ca 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -509,6 +509,7 @@ uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid) switch(get_validity(key,uid)&TRUST_MASK) { case TRUST_UNKNOWN: return _("[ unknown]"); + case TRUST_EXPIRED: return _("[ expired]"); case TRUST_UNDEFINED: return _("[ undef ]"); case TRUST_MARGINAL: return _("[marginal]"); case TRUST_FULLY: return _("[ full ]"); |