security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

gpg: Make quick-gen-key with algo "card" work for keys without keytime 

* g10/keygen.c (quick_generate_keypair): Set pCARDKEY flag if algostr
is "card" or "card/...".
--

For keys stored on NetKey cards or PIV cards we do not necessarily
know the creation time. Therefore set the cardkey flag if the generation
of a key from the keys available on the currently inserted smartcard
is requested with the special algo "card" or, in case of the extended
unattended mode, with an algo like "card/sign".

GnuPG-bug-id: 5141
Signed-off-by: Ingo Klöcker <dev@ingo-kloecker.de>
This commit is contained in:
Ingo Klöcker 2020-12-07 15:10:25 +01:00
parent 1cd615afe3
commit 255d33d651
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/keygen.c
View File

@ -4548,7 +4548,6 @@ quick_generate_keypair (ctrl_t ctrl, const char *uid, const char *algostr,
struct para_data_s *r; struct para_data_s *r;
struct output_control_s outctrl; struct output_control_s outctrl;
int use_tty; int use_tty;
u32 keytime = 0;
memset (&outctrl, 0, sizeof outctrl); memset (&outctrl, 0, sizeof outctrl);
@ -4631,7 +4630,7 @@ quick_generate_keypair (ctrl_t ctrl, const char *uid, const char *algostr,
unsigned int keyuse, subkeyuse; unsigned int keyuse, subkeyuse;
const char *curve, *subcurve; const char *curve, *subcurve;
char *keygrip, *subkeygrip; char *keygrip, *subkeygrip;
u32 subkeytime; u32 keytime, subkeytime;
err = parse_key_parameter_string (ctrl, algostr, -1, 0, err = parse_key_parameter_string (ctrl, algostr, -1, 0,
&algo, &size, &keyuse, &curve, &version, &algo, &size, &keyuse, &curve, &version,
@ -4681,6 +4680,7 @@ quick_generate_keypair (ctrl_t ctrl, const char *uid, const char *algostr,
unsigned int nbits; unsigned int nbits;
const char *curve; const char *curve;
char *keygrip; char *keygrip;
u32 keytime;
err = parse_algo_usage_expire (ctrl, 0, algostr, usagestr, expirestr, err = parse_algo_usage_expire (ctrl, 0, algostr, usagestr, expirestr,
&algo, &use, &expire, &nbits, &curve, &algo, &use, &expire, &nbits, &curve,
@ -4717,10 +4717,8 @@ quick_generate_keypair (ctrl_t ctrl, const char *uid, const char *algostr,
para = r; para = r;
} }
if (!ascii_strcasecmp (algostr, "card")
/* If KEYTIME is set we know that the key has been taken from the || !ascii_strncasecmp (algostr, "card/", 5))
* card. Store that flag in the parameters. */
if (keytime)
{ {
r = xmalloc_clear (sizeof *r); r = xmalloc_clear (sizeof *r);
r->key = pCARDKEY; r->key = pCARDKEY;