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

g10/g10.c

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