mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg: Support key flags for RENC, TIME, and GROUP.
* g10/packet.h (PUBKEY_USAGE_RENC): New. (PUBKEY_USAGE_TIME): New. (PUBKEY_USAGE_GROUP): New. * g10/getkey.c (parse_key_usage): Set the new key flags. * g10/keyedit.c (show_key_with_all_names_colon): Show the new key flags. * g10/keyid.c (usagestr_from_pk): Ditto * g10/keylist.c (print_capabilities): Ditto. * g10/keygen.c (parse_usagestr): Parse line and set new flags. (quickgen_set_para): Show flags. -- See draft-koch-openpgp-2015-rfc4880bis-00 for the current version. Actually these flags have been in the draft for years now. This patch is a first step to make use of them.
This commit is contained in:
parent
a5d9be1e28
commit
202ed9e281
7 changed files with 58 additions and 3 deletions
15
g10/keygen.c
15
g10/keygen.c
|
@ -3778,6 +3778,12 @@ parse_usagestr (const char *usagestr)
|
|||
use |= PUBKEY_USAGE_AUTH;
|
||||
else if (!ascii_strcasecmp (s, "cert"))
|
||||
use |= PUBKEY_USAGE_CERT;
|
||||
else if (!ascii_strcasecmp (s, "renc"))
|
||||
use |= PUBKEY_USAGE_RENC;
|
||||
else if (!ascii_strcasecmp (s, "time"))
|
||||
use |= PUBKEY_USAGE_TIME;
|
||||
else if (!ascii_strcasecmp (s, "group"))
|
||||
use |= PUBKEY_USAGE_GROUP;
|
||||
else
|
||||
{
|
||||
xfree (tokens);
|
||||
|
@ -4322,14 +4328,17 @@ quickgen_set_para (struct para_data_s *para, int for_subkey,
|
|||
{
|
||||
struct para_data_s *r;
|
||||
|
||||
r = xmalloc_clear (sizeof *r + 30);
|
||||
r = xmalloc_clear (sizeof *r + 50);
|
||||
r->key = for_subkey? pSUBKEYUSAGE : pKEYUSAGE;
|
||||
if (use)
|
||||
snprintf (r->u.value, 30, "%s%s%s%s",
|
||||
snprintf (r->u.value, 30, "%s%s%s%s%s%s%s",
|
||||
(use & PUBKEY_USAGE_ENC)? "encr " : "",
|
||||
(use & PUBKEY_USAGE_SIG)? "sign " : "",
|
||||
(use & PUBKEY_USAGE_AUTH)? "auth " : "",
|
||||
(use & PUBKEY_USAGE_CERT)? "cert " : "");
|
||||
(use & PUBKEY_USAGE_CERT)? "cert " : "",
|
||||
(use & PUBKEY_USAGE_RENC)? "renc " : "",
|
||||
(use & PUBKEY_USAGE_TIME)? "time " : "",
|
||||
(use & PUBKEY_USAGE_GROUP)?"group ": "");
|
||||
else
|
||||
strcpy (r->u.value, for_subkey ? "encr" : "sign");
|
||||
r->next = para;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue