security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpg,gpgsm: Hide password in debug output also for asked passwords.

Browse Source 
* g10/call-agent.c (agent_get_passphrase): Call
assuan_begin_confidential and assuan_end_confidential.
* sm/call-agent.c (gpgsm_agent_ask_passphrase): Ditto.
--

GnuPG-bug-id: 6654

The drawback of this solution is that we don't see any IPC lines from
the assuan_transact.  Everything else would require larger changes to
libassuan.
This commit is contained in:
Werner Koch 2023-11-14 15:08:20 +01:00
parent e6cedba119
commit def8f5f3d2
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/call-agent.c
View File

@ -1995,7 +1995,7 @@ agent_get_passphrase (const char *cache_id,
char *arg4 = NULL; char *arg4 = NULL;
membuf_t data; membuf_t data;
struct default_inq_parm_s dfltparm; struct default_inq_parm_s dfltparm;
int have_newsymkey; int have_newsymkey, wasconf;
memset (&dfltparm, 0, sizeof dfltparm); memset (&dfltparm, 0, sizeof dfltparm);
@ -2047,10 +2047,14 @@ agent_get_passphrase (const char *cache_id,
xfree (arg4); xfree (arg4);
init_membuf_secure (&data, 64); init_membuf_secure (&data, 64);
wasconf = assuan_get_flag (agent_ctx, ASSUAN_CONFIDENTIAL);
assuan_begin_confidential (agent_ctx);
rc = assuan_transact (agent_ctx, line, rc = assuan_transact (agent_ctx, line,
put_membuf_cb, &data, put_membuf_cb, &data,
default_inq_cb, &dfltparm, default_inq_cb, &dfltparm,
NULL, NULL); NULL, NULL);
if (!wasconf)
assuan_end_confidential (agent_ctx);
if (rc) if (rc)
xfree (get_membuf (&data, NULL)); xfree (get_membuf (&data, NULL));

5
sm/call-agent.c
View File

@ -1322,6 +1322,7 @@ gpgsm_agent_ask_passphrase (ctrl_t ctrl, const char *desc_msg, int repeat,
char *arg4 = NULL; char *arg4 = NULL;
membuf_t data; membuf_t data;
struct default_inq_parm_s inq_parm; struct default_inq_parm_s inq_parm;
int wasconf;
*r_passphrase = NULL; *r_passphrase = NULL;
@ -1340,9 +1341,13 @@ gpgsm_agent_ask_passphrase (ctrl_t ctrl, const char *desc_msg, int repeat,
xfree (arg4); xfree (arg4);
init_membuf_secure (&data, 64); init_membuf_secure (&data, 64);
wasconf = assuan_get_flag (agent_ctx, ASSUAN_CONFIDENTIAL);
assuan_begin_confidential (agent_ctx);
err = assuan_transact (agent_ctx, line, err = assuan_transact (agent_ctx, line,
put_membuf_cb, &data, put_membuf_cb, &data,
default_inq_cb, &inq_parm, NULL, NULL); default_inq_cb, &inq_parm, NULL, NULL);
if (!wasconf)
assuan_end_confidential (agent_ctx);
if (err) if (err)
xfree (get_membuf (&data, NULL)); xfree (get_membuf (&data, NULL));