diff options
| -rw-r--r-- | scd/command.c | 56 |
1 files changed, 50 insertions, 6 deletions
diff --git a/scd/command.c b/scd/command.c index 9cbfbbb42..3bfc1a5db 100644 --- a/scd/command.c +++ b/scd/command.c @@ -843,6 +843,8 @@ cmd_pkauth (assuan_context_t ctx, char *line) unsigned char *outdata; size_t outdatalen; char *keyidstr; + app_t app; + int direct = 0; if ((rc = open_card (ctrl))) return rc; @@ -857,9 +859,29 @@ cmd_pkauth (assuan_context_t ctx, char *line) if (!keyidstr) return out_of_core (); - rc = app_auth (ctrl->app_ctx, ctrl, keyidstr, pin_cb, ctx, - ctrl->in_data.value, ctrl->in_data.valuelen, - &outdata, &outdatalen); + /* When it's a keygrip, we directly use APP, with no change of + ctrl->app_ctx. */ + if (strlen (keyidstr) == 40) + { + app = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keyidstr); + direct = 1; + } + else + app = ctrl->app_ctx; + + if (app) + { + if (direct) + app->ref_count++; + rc = app_auth (app, ctrl, keyidstr, pin_cb, ctx, + ctrl->in_data.value, ctrl->in_data.valuelen, + &outdata, &outdatalen); + if (direct) + app->ref_count--; + } + else + rc = gpg_error (GPG_ERR_NO_SECKEY); + xfree (keyidstr); if (rc) { @@ -888,6 +910,8 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line) size_t outdatalen; char *keyidstr; unsigned int infoflags; + app_t app; + int direct = 0; if ((rc = open_card (ctrl))) return rc; @@ -895,9 +919,29 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line) keyidstr = xtrystrdup (line); if (!keyidstr) return out_of_core (); - rc = app_decipher (ctrl->app_ctx, ctrl, keyidstr, pin_cb, ctx, - ctrl->in_data.value, ctrl->in_data.valuelen, - &outdata, &outdatalen, &infoflags); + + /* When it's a keygrip, we directly use APP, with no change of + ctrl->app_ctx. */ + if (strlen (keyidstr) == 40) + { + app = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keyidstr); + direct = 1; + } + else + app = ctrl->app_ctx; + + if (app) + { + if (direct) + app->ref_count++; + rc = app_decipher (ctrl->app_ctx, ctrl, keyidstr, pin_cb, ctx, + ctrl->in_data.value, ctrl->in_data.valuelen, + &outdata, &outdatalen, &infoflags); + if (direct) + app->ref_count--; + } + else + rc = gpg_error (GPG_ERR_NO_SECKEY); xfree (keyidstr); if (rc) |