aboutsummaryrefslogtreecommitdiffstats
path: root/g10/g10.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2004-12-10 05:35:54 +0000
committerDavid Shaw <[email protected]>2004-12-10 05:35:54 +0000
commit1c334577f37361f8a86c3f7d5e2507dc18369f04 (patch)
tree3dc463d7106b8028c77030b9aaf9b21bdc46ed02 /g10/g10.c
parent* passphrase.c (agent_get_passphrase): New args CUSTOM_PROMPT and (diff)
downloadgnupg-1c334577f37361f8a86c3f7d5e2507dc18369f04.tar.gz
gnupg-1c334577f37361f8a86c3f7d5e2507dc18369f04.zip
* options.h, g10.c (main), textfilter.c (len_without_trailing_ws): Removed
(not used). (standard): 2440 says that textmode hashes should canonicalize line endings to CRLF and remove spaces and tabs. 2440bis-12 says to just canonicalize to CRLF. So, we default to the 2440bis-12 behavior, but revert to the strict 2440 behavior if the user specifies --rfc2440. In practical terms this makes no difference to any signatures in the real world except for a textmode detached signature.
Diffstat (limited to 'g10/g10.c')
-rw-r--r--g10/g10.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/g10.c b/g10/g10.c
index 2a17214d9..a01df371c 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -2092,6 +2092,8 @@ 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. */