aboutsummaryrefslogtreecommitdiffstats
path: root/agent/command.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-12-12 11:35:45 +0000
committerWerner Koch <[email protected]>2014-12-12 11:47:28 +0000
commitf3f9f9b2844c35f7942ee904d5222523615cdad4 (patch)
treedcf872de1625703b30a8fbf0758291553fb2767b /agent/command.c
parentgpg: Fix possible read of unallocated memory (diff)
downloadgnupg-f3f9f9b2844c35f7942ee904d5222523615cdad4.tar.gz
gnupg-f3f9f9b2844c35f7942ee904d5222523615cdad4.zip
gpg: Let --card--status create a shadow key (card key stub).
* agent/command.c (cmd_learn): Add option --sendinfo. * agent/learncard.c (agent_handle_learn): Add arg "send" andsend certifciate only if that is set. * g10/call-agent.c (agent_scd_learn): Use --sendinfo. Make INFO optional. (agent_learn): Remove. * g10/keygen.c (gen_card_key): Replace agent_learn by agent_scd_learn. -- The requirement of using --card-status on the first use of card on a new box is a bit annoying but the alternative of always checking whether a card is available before a decryption starts does not sound promising either. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/command.c')
-rw-r--r--agent/command.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/agent/command.c b/agent/command.c
index 3e8066381..c875f5516 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1619,21 +1619,26 @@ cmd_get_confirmation (assuan_context_t ctx, char *line)
static const char hlp_learn[] =
- "LEARN [--send]\n"
+ "LEARN [--send][--sendinfo]\n"
"\n"
"Learn something about the currently inserted smartcard. With\n"
- "--send the new certificates are send back.";
+ "--sendinfo information about the card is returned; with --send\n"
+ "the available certificates are returned as D lines.";
static gpg_error_t
cmd_learn (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
- int rc;
+ gpg_error_t err;
+ int send, sendinfo;
+
+ send = has_option (line, "--send");
+ sendinfo = send? 1 : has_option (line, "--sendinfo");
if (ctrl->restricted)
return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
- rc = agent_handle_learn (ctrl, has_option (line, "--send")? ctx : NULL);
- return leave_cmd (ctx, rc);
+ err = agent_handle_learn (ctrl, send, sendinfo? ctx : NULL);
+ return leave_cmd (ctx, err);
}