aboutsummaryrefslogtreecommitdiffstats
path: root/g10/import.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2023-07-04 15:37:54 +0000
committerWerner Koch <[email protected]>2023-07-04 15:37:54 +0000
commit334f5d95c825f5c8a0785f6ab7cb6f7e94269a81 (patch)
treeef15051d5b299885684c77f876ddbd374b8e5cde /g10/import.c
parentagent: Fix formatting thread ID of nPth. (diff)
parentPost release updates (diff)
downloadgnupg-334f5d95c825f5c8a0785f6ab7cb6f7e94269a81.tar.gz
gnupg-334f5d95c825f5c8a0785f6ab7cb6f7e94269a81.zip
Merge branch 'STABLE-BRANCH-2-4' into master
Diffstat (limited to 'g10/import.c')
-rw-r--r--g10/import.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/g10/import.c b/g10/import.c
index 987fef3cd..d84a083cc 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1564,6 +1564,20 @@ impex_filter_getval (void *cookie, const char *propname)
{
result = dateonlystr_from_pk (pk);
}
+ else if (!strcmp (propname, "key_expires"))
+ {
+ snprintf (numbuf, sizeof numbuf, "%lu", (ulong)pk->expiredate);
+ result = numbuf;
+ }
+ else if (!strcmp (propname, "key_expires_d"))
+ {
+ static char exdatestr[MK_DATESTR_SIZE];
+
+ if (pk->expiredate)
+ result = mk_datestr (exdatestr, sizeof exdatestr, pk->expiredate);
+ else
+ result = "";
+ }
else if (!strcmp (propname, "expired"))
{
result = pk->has_expired? "1":"0";