diff options
| author | NIIBE Yutaka <[email protected]> | 2019-05-23 00:40:01 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2019-05-23 00:40:01 +0000 |
| commit | 265e6d670682e661cec89657c3330b0b388ca0a7 (patch) | |
| tree | dc7f14528100bd207b37741575e66ffd6ea83b13 | |
| parent | gpg: Do not bail on an invalid packet in the local keyring. (diff) | |
| download | gnupg-265e6d670682e661cec89657c3330b0b388ca0a7.tar.gz gnupg-265e6d670682e661cec89657c3330b0b388ca0a7.zip | |
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 <[email protected]>
| -rw-r--r-- | g10/getkey.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 1e7334307..bb8486bb4 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -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; + { + pk->has_expired = main_pk->has_expired; + if (!pk->expiredate || pk->expiredate > main_pk->expiredate) + pk->expiredate = main_pk->expiredate; + } } } return; |