mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
g10: Copy expiredate from primary key when marked expired.
* g10/getkey.c (merge_selfsigs): Update ->expiredate of subkey. -- GnuPG-bug-id: 3343 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
4c7d63cd5b
commit
265e6d6706
@ -3185,7 +3185,11 @@ merge_selfsigs (ctrl_t ctrl, kbnode_t keyblock)
|
||||
memcpy (&pk->revoked, &rinfo, sizeof (rinfo));
|
||||
}
|
||||
if (main_pk->has_expired)
|
||||
{
|
||||
pk->has_expired = main_pk->has_expired;
|
||||
if (!pk->expiredate || pk->expiredate > main_pk->expiredate)
|
||||
pk->expiredate = main_pk->expiredate;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
|
Loading…
x
Reference in New Issue
Block a user