aboutsummaryrefslogtreecommitdiffstats
path: root/agent/learncard.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2020-02-13 10:45:41 +0000
committerWerner Koch <[email protected]>2020-02-13 10:45:41 +0000
commit638526d37fee0a1febac9d29fab384b913819fc9 (patch)
tree6edb9353d6704787e63c799bae7f84b65dff7fb9 /agent/learncard.c
parentgpg: Rename the struct card_key_info_s. (diff)
downloadgnupg-638526d37fee0a1febac9d29fab384b913819fc9.tar.gz
gnupg-638526d37fee0a1febac9d29fab384b913819fc9.zip
agent: Allow signing with card key even without a stub key.
* agent/call-scd.c (agent_card_serialno): Allow NULL for R_SERIAL. (struct readkey_status_parm_s): New. (readkey_status_cb): New. (agent_card_readkey): Add optional arg R_KEYREF and change all callers. * agent/findkey.c (key_parms_from_sexp): Allow also a "public-key". * agent/divert-scd.c (ask_for_card): Allow for SHADOW_INFO being NULL. * agent/pksign.c (agent_pksign_do): Fallback to sign with an on-card if there is no stub key yet. Create the stub key. Also fixed a misnaming between s_pkey and s_skey. -- This change allows to create OpenPGP keys directly from a card without first making sure that a stub key exists. It is also the less surprising behaviour. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/learncard.c')
-rw-r--r--agent/learncard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/learncard.c b/agent/learncard.c
index f40f5ac4d..678ff9b96 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -401,7 +401,7 @@ agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context, int force)
continue; /* The key is already available. */
/* Unknown key - store it. */
- rc = agent_card_readkey (ctrl, item->id, &pubkey);
+ rc = agent_card_readkey (ctrl, item->id, &pubkey, NULL);
if (rc)
{
log_debug ("agent_card_readkey failed: %s\n", gpg_strerror (rc));