diff options
| author | Werner Koch <wk@gnupg.org> | 2014-12-12 12:35:45 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-12-12 12:47:28 +0100 |
| commit | f3f9f9b2844c35f7942ee904d5222523615cdad4 (patch) | |
| tree | dcf872de1625703b30a8fbf0758291553fb2767b /g10/keygen.c | |
| parent | gpg: Fix possible read of unallocated memory (diff) | |
| download | gnupg2-f3f9f9b2844c35f7942ee904d5222523615cdad4.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to '')
| -rw-r--r-- | g10/keygen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index 89cc255bc..c25caadf2 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -4447,7 +4447,7 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root, /* Send the learn command so that the agent creates a shadow key for card key. We need to do that now so that we are able to create the self-signatures. */ - err = agent_learn (); + err = agent_scd_learn (NULL); if (err) { /* Oops: Card removed during generation. */ |