diff options
| author | NIIBE Yutaka <[email protected]> | 2022-05-25 05:53:06 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2022-05-25 05:53:06 +0000 |
| commit | 052f58422dca1044aba7acb4cf57416e7a8cb01f (patch) | |
| tree | ee9f82b478926e8d14297947d0cd3b9cff11214e /agent/command.c | |
| parent | agent: Add missing assuan_end_confidential call. (diff) | |
| download | gnupg-052f58422dca1044aba7acb4cf57416e7a8cb01f.tar.gz gnupg-052f58422dca1044aba7acb4cf57416e7a8cb01f.zip | |
agent,scd: Make sure to set CONFIDENTIAL flag in Assuan.
* agent/call-scd.c (inq_needpin): Call assuan_begin_confidential
and assuan_end_confidential, and wipe the memory after use.
* agent/command.c (cmd_preset_passphrase): Likewise.
(cmd_put_secret): Likewise.
* scd/command.c (pin_cb): Likewise.
--
GnuPG-bug-id: 5977
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/command.c')
| -rw-r--r-- | agent/command.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/agent/command.c b/agent/command.c index 052f9db48..2058c2a59 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2387,7 +2387,11 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line) rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%zu", maxlen); if (!rc) - rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen); + { + assuan_begin_confidential (ctx); + rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen); + assuan_end_confidential (ctx); + } } else rc = set_error (GPG_ERR_NOT_IMPLEMENTED, "passphrase is required"); @@ -2396,7 +2400,10 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line) { rc = agent_put_cache (ctrl, grip_clear, CACHE_MODE_ANY, passphrase, ttl); if (opt_inquire) - xfree (passphrase); + { + wipememory (passphrase, len); + xfree (passphrase); + } } leave: @@ -3219,8 +3226,12 @@ cmd_put_secret (assuan_context_t ctx, char *line) { err = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%u",MAXLEN_PUT_SECRET); if (!err) - err = assuan_inquire (ctx, "SECRET", - &value, &valuelen, MAXLEN_PUT_SECRET); + { + assuan_begin_confidential (ctx); + err = assuan_inquire (ctx, "SECRET", + &value, &valuelen, MAXLEN_PUT_SECRET); + assuan_end_confidential (ctx); + } if (err) goto leave; } |