security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: Show private DO information in the card status.

Browse Source 
* g10/call-agent.c (agent_release_card_info): Free private_do.
(learn_status_cb): Parse PRIVATE-DO-n stati.
--

Reported-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>

Provided patch extended to release the memory.
This commit is contained in:
Werner Koch 2014-12-16 13:10:09 +01:00
parent 5ab5b3fa69
commit ce92129240
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
g10/call-agent.c
View File

@ -471,6 +471,8 @@ get_serialno_cb (void *opaque, const char *line)
void void
agent_release_card_info (struct agent_card_info_s *info) agent_release_card_info (struct agent_card_info_s *info)
{ {
int i;
if (!info) if (!info)
return; return;
@ -482,8 +484,14 @@ agent_release_card_info (struct agent_card_info_s *info)
xfree (info->login_data); info->login_data = NULL; xfree (info->login_data); info->login_data = NULL;
info->cafpr1valid = info->cafpr2valid = info->cafpr3valid = 0; info->cafpr1valid = info->cafpr2valid = info->cafpr3valid = 0;
info->fpr1valid = info->fpr2valid = info->fpr3valid = 0; info->fpr1valid = info->fpr2valid = info->fpr3valid = 0;
for (i=0; i < DIM(info->private_do); i++)
{
xfree (info->private_do[i]);
info->private_do[i] = NULL;
}
} }
static gpg_error_t static gpg_error_t
learn_status_cb (void *opaque, const char *line) learn_status_cb (void *opaque, const char *line)
{ {
@ -650,6 +658,14 @@ learn_status_cb (void *opaque, const char *line)
parm->key_attr[keyno].nbits = nbits; parm->key_attr[keyno].nbits = nbits;
} }
} }
else if (keywordlen == 12 && !memcmp (keyword, "PRIVATE-DO-", 11)
&& strchr("1234", keyword[11]))
{
int no = keyword[11] - '1';
assert (no >= 0 && no <= 3);
xfree (parm->private_do[no]);
parm->private_do[no] = unescape_status_string (line);
}
return 0; return 0;
} }