mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* parse-packet.c (parse_signature): Minor fix - signatures should expire
at their expiration time and not one second later. * keygen.c (proc_parameter_file): Allow specifying preferences string (i.e. "s5 s2 z1 z2", etc) in a batchmode key generation file. * keyedit.c (keyedit_menu): Print standard error message when signing a revoked key (no new translation). * getkey.c (merge_selfsigs): Get the default set of key prefs from the real (not attribute) primary uid.
This commit is contained in:
parent
9d7b26c784
commit
9ef1a80f8d
5 changed files with 25 additions and 4 deletions
|
@ -1236,7 +1236,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
|
|||
p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_SIG_EXPIRE,NULL);
|
||||
if(p)
|
||||
sig->expiredate=sig->timestamp+buffer_to_u32(p);
|
||||
if(sig->expiredate>0 && sig->expiredate<make_timestamp())
|
||||
if(sig->expiredate && sig->expiredate<=make_timestamp())
|
||||
sig->flags.expired=1;
|
||||
|
||||
p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_POLICY,NULL);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue