gnupg/g10 (ChangeLog g10.c options.h textfilter.c trustdb.c)

[cvs user dshaw]

    Date: Saturday, December 11, 2004 @ 05:47:34
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog g10.c options.h textfilter.c trustdb.c

* 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.


--------------+
 ChangeLog    |    8 ++++++++
 g10.c        |    2 --
 options.h    |    1 -
 textfilter.c |    5 ++---
 trustdb.c    |    1 +
 5 files changed, 11 insertions(+), 6 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.651 gnupg/g10/ChangeLog:1.652
--- gnupg/g10/ChangeLog:1.651	Fri Dec 10 11:49:14 2004
+++ gnupg/g10/ChangeLog	Sat Dec 11 05:47:33 2004
@@ -1,3 +1,11 @@
+2004-12-10  David Shaw  <dshaw at 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 at g10code.com>
 
 	* app-openpgp.c (send_fprtime_if_not_null): New.
Index: gnupg/g10/g10.c
diff -u gnupg/g10/g10.c:1.291 gnupg/g10/g10.c:1.292
--- gnupg/g10/g10.c:1.291	Fri Dec 10 06:35:54 2004
+++ gnupg/g10/g10.c	Sat Dec 11 05:47:33 2004
@@ -2092,8 +2092,6 @@
 	    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. */
Index: gnupg/g10/options.h
diff -u gnupg/g10/options.h:1.129 gnupg/g10/options.h:1.130
--- gnupg/g10/options.h:1.129	Fri Dec 10 06:35:54 2004
+++ gnupg/g10/options.h	Sat Dec 11 05:47:33 2004
@@ -192,7 +192,6 @@
   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. */
Index: gnupg/g10/textfilter.c
diff -u gnupg/g10/textfilter.c:1.16 gnupg/g10/textfilter.c:1.17
--- gnupg/g10/textfilter.c:1.16	Fri Dec 10 06:35:54 2004
+++ gnupg/g10/textfilter.c	Sat Dec 11 05:47:33 2004
@@ -61,6 +61,7 @@
     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 @@
 	   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 @@
 }
 
 
-
-
 /****************
  * The filter is used to make canonical text: Lines are terminated by
  * CR, LF, trailing white spaces are removed.
Index: gnupg/g10/trustdb.c
diff -u gnupg/g10/trustdb.c:1.133 gnupg/g10/trustdb.c:1.134
--- gnupg/g10/trustdb.c:1.133	Thu Nov 25 04:48:34 2004
+++ gnupg/g10/trustdb.c	Sat Dec 11 05:47:33 2004
@@ -509,6 +509,7 @@
     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  ]");