mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* sign.c (mk_notation_and_policy): Free unneeded buffer.
* hkp.c (parse_hkp_index): Properly handle the '&' character (i.e. "&") in HKP responses. * getkey.c (merge_selfsigs_main): Fix reversed expiration time check with self-sigs. * keyedit.c (sign_uids): When making a new self-sig on a v3 key, make a v3 self-sig unless it is currently a v3 self-sig being promoted to v4.
This commit is contained in:
parent
1848ef6950
commit
ee39ad5750
5 changed files with 35 additions and 5 deletions
|
@ -1280,7 +1280,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
|
|||
|
||||
p = parse_sig_subpkt( sig->hashed,
|
||||
SIGSUBPKT_SIG_EXPIRE, NULL );
|
||||
if ( p && (sig->timestamp + buffer_to_u32(p)) >= curtime )
|
||||
if ( p && (sig->timestamp + buffer_to_u32(p)) <= curtime )
|
||||
; /* signature has expired - ignore it */
|
||||
else {
|
||||
sigdate = sig->timestamp;
|
||||
|
@ -1411,7 +1411,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
|
|||
|
||||
p = parse_sig_subpkt (sig->hashed,
|
||||
SIGSUBPKT_SIG_EXPIRE, NULL );
|
||||
if ( p && (sig->timestamp + buffer_to_u32(p)) >= curtime )
|
||||
if ( p && (sig->timestamp + buffer_to_u32(p)) <= curtime )
|
||||
; /* signature/revocation has expired - ignore it */
|
||||
else {
|
||||
sigdate = sig->timestamp;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue