mirror of git://git.gnupg.org/gnupg.git
gpg,sm: Set confidential in assuan communication for password.
* g10/call-agent.c (default_inq_cb): Call assuan_begin_confidential
and assuan_end_confidential.
* sm/call-agent.c (default_inq_cb): Likewise.
--
Cherry pick from master commit of:
ec1446f944
GnuPG-bug-id: 6654
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
3572b19fbd
commit
bafa7bf27f
|
@ -161,6 +161,7 @@ default_inq_cb (void *opaque, const char *line)
|
|||
|| has_leading_keyword (line, "NEW_PASSPHRASE"))
|
||||
&& opt.pinentry_mode == PINENTRY_MODE_LOOPBACK)
|
||||
{
|
||||
assuan_begin_confidential (parm->ctx);
|
||||
if (have_static_passphrase ())
|
||||
{
|
||||
s = get_static_passphrase ();
|
||||
|
@ -187,6 +188,7 @@ default_inq_cb (void *opaque, const char *line)
|
|||
err = assuan_send_data (parm->ctx, pw, strlen (pw));
|
||||
xfree (pw);
|
||||
}
|
||||
assuan_end_confidential (parm->ctx);
|
||||
}
|
||||
else if ((s = has_leading_keyword (line, "CONFIRM"))
|
||||
&& opt.pinentry_mode == PINENTRY_MODE_LOOPBACK
|
||||
|
|
|
@ -221,7 +221,9 @@ default_inq_cb (void *opaque, const char *line)
|
|||
&& have_static_passphrase ())
|
||||
{
|
||||
const char *s = get_static_passphrase ();
|
||||
assuan_begin_confidential (parm->ctx);
|
||||
err = assuan_send_data (parm->ctx, s, strlen (s));
|
||||
assuan_end_confidential (parm->ctx);
|
||||
}
|
||||
else
|
||||
log_error ("ignoring gpg-agent inquiry '%s'\n", line);
|
||||
|
|
Loading…
Reference in New Issue