mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Fully implement the group key flag.
* g10/getkey.c (merge_selfsigs_main): Do not mask out the group bit.
(merge_selfsigs_subkey): Ditto/
* g10/keygen.c (ask_key_flags_with_mask): Ditto.
(proc_parameter_file): Ditto.
--
Updates-commit: 0988e49c45
This commit is contained in:
parent
727e125a4d
commit
8833a34bf0
2 changed files with 7 additions and 4 deletions
|
@ -3182,7 +3182,7 @@ merge_selfsigs_main (ctrl_t ctrl, kbnode_t keyblock, int *r_revoked,
|
|||
/* Check that the usage matches the usage as given by the algo. */
|
||||
int x = openpgp_pk_algo_usage (pk->pubkey_algo);
|
||||
if (x) /* Mask it down to the actual allowed usage. */
|
||||
key_usage &= x;
|
||||
key_usage &= (x | PUBKEY_USAGE_GROUP);
|
||||
}
|
||||
|
||||
/* Whatever happens, it's a primary key, so it can certify. */
|
||||
|
@ -3457,7 +3457,7 @@ merge_selfsigs_subkey (ctrl_t ctrl, kbnode_t keyblock, kbnode_t subnode)
|
|||
/* Check that the usage matches the usage as given by the algo. */
|
||||
int x = openpgp_pk_algo_usage (subpk->pubkey_algo);
|
||||
if (x) /* Mask it down to the actual allowed usage. */
|
||||
key_usage &= x;
|
||||
key_usage &= (x | PUBKEY_USAGE_GROUP);
|
||||
}
|
||||
|
||||
subpk->pubkey_usage = key_usage;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue