1 files changed, 24 insertions, 1 deletions
diff --git a/g10/keyid.c b/g10/keyid.c
index 1e81545e6..624625d5a 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -318,7 +318,6 @@ datestr_from_sig( PKT_signature *sig )
     return mk_datestr (buffer, atime);
 }
 
-
 const char *
 expirestr_from_pk( PKT_public_key *pk )
 {
@@ -344,6 +343,18 @@ expirestr_from_sk( PKT_secret_key *sk )
 }
 
 const char *
+expirestr_from_sig( PKT_signature *sig )
+{
+    static char buffer[11+5];
+    time_t atime;
+
+    if(!sig->expiredate)
+      return "never     ";
+    atime=sig->expiredate;
+    return mk_datestr (buffer, atime);
+}
+
+const char *
 colon_strtime (u32 t)
 {
     if (!t)
@@ -389,6 +400,18 @@ colon_datestr_from_sig (PKT_signature *sig)
     return datestr_from_sig (sig);
 }
 
+const char *
+colon_expirestr_from_sig (PKT_signature *sig)
+{
+    if(!sig->expiredate)
+        return "";
+    if (opt.fixed_list_mode) {
+        static char buf[15];
+        sprintf (buf, "%lu", (ulong)sig->expiredate);
+        return buf;
+    }
+    return expirestr_from_sig (sig);
+}
 
 
 /**************** .