summaryrefslogtreecommitdiffstats
path: root/g10/call-agent.h
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2015-04-03 10:39:59 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2015-04-03 10:39:59 +0200
commitf82c4a6d0d76e716b6a7b22ca964fa2da1f962a0 (patch)
tree4a2ff1ab9e04bc630126719fce01d097308028e3 /g10/call-agent.h
parentagent: Add --force option for LEARN. (diff)
downloadgnupg2-f82c4a6d0d76e716b6a7b22ca964fa2da1f962a0.tar.xz
gnupg2-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 'g10/call-agent.h')
-rw-r--r--g10/call-agent.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/call-agent.h b/g10/call-agent.h
index 9c104e88e..df570a44b 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -77,7 +77,7 @@ struct agent_card_genkey_s {
void agent_release_card_info (struct agent_card_info_s *info);
/* Return card info. */
-int agent_scd_learn (struct agent_card_info_s *info);
+int agent_scd_learn (struct agent_card_info_s *info, int force);
/* Send an APDU to the card. */
gpg_error_t agent_scd_apdu (const char *hexapdu, unsigned int *r_sw);