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 /g10/textfilter.c | |
| 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.
Diffstat (limited to 'g10/textfilter.c')
| -rw-r--r-- | g10/textfilter.c | 5 |
1 files changed, 2 insertions, 3 deletions
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. |