aboutsummaryrefslogtreecommitdiffstats
path: root/agent/learncard.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/learncard.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/learncard.c')
-rw-r--r--agent/learncard.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/agent/learncard.c b/agent/learncard.c
index c60b3f48d..62569ceff 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -296,10 +296,10 @@ send_cert_back (ctrl_t ctrl, const char *id, void *assuan_context)
return 0;
}
-/* Perform the learn operation. If ASSUAN_CONTEXT is not NULL all new
- certificates are send back via Assuan. */
+/* Perform the learn operation. If ASSUAN_CONTEXT is not NULL and
+ SEND is true all new certificates are send back via Assuan. */
int
-agent_handle_learn (ctrl_t ctrl, void *assuan_context)
+agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context)
{
int rc;
@@ -369,7 +369,7 @@ agent_handle_learn (ctrl_t ctrl, void *assuan_context)
log_info (" id: %s (type=%d)\n",
citem->id, citem->type);
- if (assuan_context)
+ if (assuan_context && send)
{
rc = send_cert_back (ctrl, citem->id, assuan_context);
if (rc)
@@ -439,9 +439,9 @@ agent_handle_learn (ctrl_t ctrl, void *assuan_context)
}
if (opt.verbose)
- log_info ("stored\n");
+ log_info (" id: %s - shadow key created\n", item->id);
- if (assuan_context)
+ if (assuan_context && send)
{
CERTINFO citem;