mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +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
|
@ -1635,7 +1635,7 @@ merge_selfsigs( KBNODE keyblock )
|
|||
if(k->pkt->pkttype==PKT_PUBLIC_SUBKEY)
|
||||
k->pkt->pkt.public_key->is_valid=0;
|
||||
|
||||
/* set the preference list of all keys to those of the primary
|
||||
/* set the preference list of all keys to those of the primary real
|
||||
* user ID. Note: we use these preferences when we don't know by
|
||||
* which user ID the key has been selected.
|
||||
* fixme: we should keep atoms of commonly used preferences or
|
||||
|
@ -1648,6 +1648,7 @@ merge_selfsigs( KBNODE keyblock )
|
|||
mdc_feature = 0;
|
||||
for (k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next) {
|
||||
if (k->pkt->pkttype == PKT_USER_ID
|
||||
&& !k->pkt->pkt.user_id->attrib_data
|
||||
&& k->pkt->pkt.user_id->is_primary) {
|
||||
prefs = k->pkt->pkt.user_id->prefs;
|
||||
mdc_feature = k->pkt->pkt.user_id->mdc_feature;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue