security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* options.h, keyserver.c (keyserver_opts), g10.c (main): New keyserver

Browse source 
option "include-subkeys".  This feature already existed, but now can be
turned off.  It defaults to on.

* options.h, keyserver.c (parse_keyserver_options, keyserver_spawn): There
are now enough options to justify making a structure for the keyserver
options rather than a page of if-then-else-if-then-etc.

* getkey.c (merge_keys_and_selfsig, merge_selfsigs_main): Fix bug in
calculating key expiration dates.
This commit is contained in:
David Shaw 2002-06-10 21:32:07 +00:00
parent 3bff7c1d60
commit 6ae955f451
5 changed files with 93 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

8
g10/getkey.c
View file

@ -1084,10 +1084,12 @@ merge_keys_and_selfsig( KBNODE keyblock )
}
}
if(pk && (pk->expiredate==0 || pk->expiredate>pk->max_expiredate))
if(pk && (pk->expiredate==0 ||
(pk->max_expiredate && pk->expiredate>pk->max_expiredate)))
pk->expiredate=pk->max_expiredate;
if(sk && (sk->expiredate==0 || sk->expiredate>sk->max_expiredate))
if(sk && (sk->expiredate==0 ||
(sk->max_expiredate && sk->expiredate>sk->max_expiredate)))
sk->expiredate=sk->max_expiredate;
}
}
@ -1527,7 +1529,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
/* Currently only v3 keys have a maximum expiration date, but I'll
bet v5 keys get this feature again. */
if(key_expire==0 || key_expire>pk->max_expiredate)
if(key_expire==0 || (pk->max_expiredate && key_expire>pk->max_expiredate))
key_expire=pk->max_expiredate;
pk->has_expired = key_expire >= curtime? 0 : key_expire;