aboutsummaryrefslogtreecommitdiffstats
path: root/g10/build-packet.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2006-05-23 03:58:53 +0000
committerDavid Shaw <[email protected]>2006-05-23 03:58:53 +0000
commit197c7a3e47c38811c6dd266136785cf644f76d55 (patch)
tree659d7eb9dd9c298999ef2f84a0a5e4a575b251a6 /g10/build-packet.c
parent* import.c (import_one): Fix bug when importing a new key from a file. (diff)
downloadgnupg-197c7a3e47c38811c6dd266136785cf644f76d55.tar.gz
gnupg-197c7a3e47c38811c6dd266136785cf644f76d55.zip
* parse-packet.c (dump_sig_subpkt, parse_signature), build-packet.c
(build_sig_subpkt_from_sig), getkey.c (fixup_uidnode, merge_selfsigs_main, merge_selfsigs_subkey), keygen.c (keygen_add_key_expire): Fix meaning of key expiration and sig expiration subpackets - zero means "never expire" according to 2440, not "expire instantly".
Diffstat (limited to '')
-rw-r--r--g10/build-packet.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 5c239b79e..a7ac5d829 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -824,7 +824,8 @@ build_sig_subpkt_from_sig( PKT_signature *sig )
if(sig->expiredate>sig->timestamp)
u=sig->expiredate-sig->timestamp;
else
- u=0;
+ u=1; /* A 1-second expiration time is the shortest one
+ OpenPGP has */
buf[0] = (u >> 24) & 0xff;
buf[1] = (u >> 16) & 0xff;