diff --git a/doc/DETAILS b/doc/DETAILS index 185d1af60..8998d875e 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -328,8 +328,8 @@ more arguments in future versions. UNEXPECTED Unexpected data has been encountered - 0 - not further specified 1 - + 0 - not further specified + TRUST_UNDEFINED TRUST_NEVER @@ -357,9 +357,6 @@ more arguments in future versions. status codes is emitted in addition to a TRUST_* status. Without PKA info available or - SIGEXPIRED - This is deprecated in favor of KEYEXPIRED. - KEYEXPIRED The key has expired. expire-timestamp is the expiration time in seconds since Epoch. This status line is not very useful @@ -701,6 +698,14 @@ more arguments in future versions. by g13. +Status lines which are not anymore used: + + SIGEXPIRED removed on 2011-02-04. + This is deprecated in favor of KEYEXPIRED. + + + + Format of the "--attribute-fd" output ===================================== diff --git a/g10/ChangeLog b/g10/ChangeLog index 3a1d68f2b..98ea735eb 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2011-02-04 Werner Koch + + * sig-check.c (do_check_messages): Remove the long deprecated + SIGEXPIRED status line. + 2011-02-03 Werner Koch * export.c (transfer_format_to_openpgp) [!HAVE_GCRY_PK_GET_CURVE]: diff --git a/g10/sig-check.c b/g10/sig-check.c index 9dee55d52..4bd7aef88 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -238,10 +238,8 @@ do_check_messages( PKT_public_key *pk, PKT_signature *sig, if (opt.verbose) log_info(_("NOTE: signature key %s expired %s\n"), keystr_from_pk(pk), asctimestamp( pk->expiredate ) ); - /* SIGEXPIRED is deprecated. Use KEYEXPIRED. */ sprintf(buf,"%lu",(ulong)pk->expiredate); write_status_text(STATUS_KEYEXPIRED,buf); - write_status(STATUS_SIGEXPIRED); if(r_expired) *r_expired = 1; }