diff options
| author | Werner Koch <wk@gnupg.org> | 2018-03-27 08:48:00 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-03-27 08:48:00 +0200 |
| commit | d4dc4245bf0221d2db4118718fc2528ecf43b97b (patch) | |
| tree | 5912abc9b9ba056a882bcd933105ba4dde73c560 /g10/call-agent.c | |
| parent | Change license of argparse.c back to LGPLv2.1 (diff) | |
| parent | agent: Make the request origin a part of the cache items. (diff) | |
| download | gnupg2-d4dc4245bf0221d2db4118718fc2528ecf43b97b.tar.xz gnupg2-d4dc4245bf0221d2db4118718fc2528ecf43b97b.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
Diffstat (limited to 'g10/call-agent.c')
| -rw-r--r-- | g10/call-agent.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c index b1f589bbc..1445f4e44 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -289,6 +289,23 @@ start_agent (ctrl_t ctrl, int flag_for_card) } } + /* Pass on the request origin. */ + if (opt.request_origin) + { + char *tmp = xasprintf ("OPTION pretend-request-origin=%s", + str_request_origin (opt.request_origin)); + rc = assuan_transact (agent_ctx, tmp, + NULL, NULL, NULL, NULL, NULL, NULL); + xfree (tmp); + if (rc) + { + log_error ("setting request origin '%s' failed: %s\n", + str_request_origin (opt.request_origin), + gpg_strerror (rc)); + write_status_error ("set_request_origin", rc); + } + } + /* In DE_VS mode under Windows we require that the JENT RNG * is active. */ #ifdef HAVE_W32_SYSTEM @@ -591,6 +608,8 @@ learn_status_cb (void *opaque, const char *line) parm->extcap.ki = abool; else if (!strcmp (p, "aac")) parm->extcap.aac = abool; + else if (!strcmp (p, "kdf")) + parm->extcap.kdf = abool; else if (!strcmp (p, "si")) parm->status_indicator = strtoul (p2, NULL, 10); } |