diff options
| author | NIIBE Yutaka <[email protected]> | 2015-04-03 08:39:59 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-04-03 08:39:59 +0000 |
| commit | f82c4a6d0d76e716b6a7b22ca964fa2da1f962a0 (patch) | |
| tree | 4a2ff1ab9e04bc630126719fce01d097308028e3 /g10/keygen.c | |
| parent | agent: Add --force option for LEARN. (diff) | |
| download | gnupg-f82c4a6d0d76e716b6a7b22ca964fa2da1f962a0.tar.gz gnupg-f82c4a6d0d76e716b6a7b22ca964fa2da1f962a0.zip | |
g10: Fix keytocard.
g10/call-agent.h (agent_scd_learn): Add FORCE option.
g10/call-agent.c (agent_scd_learn): Implement FORCE option.
g10/keygen.c (gen_card_key): Follow the change of option.
g10/card-util.c (change_pin, card_status, factory_reset): Likewise.
g10/keyedit.c (keyedit_menu): Update private key storage by
agent_scd_learn.
--
This is not a perfect solution since there is a possibility user
unplug card before quitting 'gpg --keyedit' session. Usually,
it works well.
GnuPG-bug-id: 1846
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 769e193f2..4b0398a11 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -4487,7 +4487,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_scd_learn (NULL); + err = agent_scd_learn (NULL, 0); if (err) { /* Oops: Card removed during generation. */ |