[git] GnuPG - branch, master, updated. gnupg-2.1.3-40-g02d5e12
by Werner Koch
cvs at cvs.gnupg.org
Mon May 11 10:54:56 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 02d5e1205489aa5027a87a64552eaf15984dc22d (commit)
via 14232c3870c5ef5d2fa15e8ed3f302b1ba29d25c (commit)
from b03a2647299a6c8764a2574590cbaccdff9e497d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 02d5e1205489aa5027a87a64552eaf15984dc22d
Author: Werner Koch <wk at gnupg.org>
Date: Mon May 11 10:25:09 2015 +0200
agent: Add strings for use by future Pinentry versions.
* agent/call-pinentry.c (start_pinentry): Add more strings.
--
We do this so that translations of these strings will be available at
the time a pinentry implements features which require these strings.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 8cbb33e..64c64a9 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -424,7 +424,7 @@ start_pinentry (ctrl_t ctrl)
{
/* Provide a few default strings for use by the pinentries. This
may help a pinentry to avoid implementing localization code. */
- static struct { const char *key, *value; } tbl[] = {
+ static struct { const char *key, *value; int mode; } tbl[] = {
/* TRANSLATORS: These are labels for buttons etc used in
Pinentries. An underscore indicates that the next letter
should be used as an accelerator. Double the underscore for
@@ -432,7 +432,14 @@ start_pinentry (ctrl_t ctrl)
the second vertical bar. */
{ "ok", N_("|pinentry-label|_OK") },
{ "cancel", N_("|pinentry-label|_Cancel") },
+ { "yes", N_("|pinentry-label|_Yes") },
+ { "no", N_("|pinentry-label|_No") },
{ "prompt", N_("|pinentry-label|PIN:") },
+ { "pwmngr", N_("|pinentry-label|_Save in password manager") },
+ { "cf-visi",N_("Do you really want to make your "
+ "passphrase visible on the screen?") },
+ { "tt-visi",N_("|pinentry-tt|Make passphrase visible") },
+ { "tt-hide",N_("|pinentry-tt|Hide passphrase") },
{ NULL, NULL}
};
char *optstr;
commit 14232c3870c5ef5d2fa15e8ed3f302b1ba29d25c
Author: Werner Koch <wk at gnupg.org>
Date: Mon May 11 10:23:24 2015 +0200
agent: Add option --debug-pinentry.
* agent/gpg-agent.c (oDebugPinentry): New.
(opts): Add --debug-pinentry.
(parse_rereadable_options): Set that option.
* agent/call-pinentry.c (start_pinentry): Pass option to
assuan_set_flag.
--
This option is quite useful to see the IPC between gpg-agent and
Pinentry. Note that "debug 1024" is also required.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/agent/agent.h b/agent/agent.h
index b374ee8..4d28eff 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -67,6 +67,9 @@ struct
char *startup_lc_ctype;
char *startup_lc_messages;
+ /* Enable pinentry debugging (--debug 1024 should also be used). */
+ int debug_pinentry;
+
/* Filename of the program to start as pinentry. */
const char *pinentry_program;
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 0a0f95b..8cbb33e 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -332,7 +332,7 @@ start_pinentry (ctrl_t ctrl)
easier to read. We might want to add a new debug option to enable
pinentry logging. */
#ifdef ASSUAN_NO_LOGGING
- assuan_set_flag (ctx, ASSUAN_NO_LOGGING, 1);
+ assuan_set_flag (ctx, ASSUAN_NO_LOGGING, !opt.debug_pinentry);
#endif
/* Connect to the pinentry and perform initial handshaking. Note
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index c27de89..c846ab4 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -79,6 +79,7 @@ enum cmd_and_opt_values
oDebugLevel,
oDebugWait,
oDebugQuickRandom,
+ oDebugPinentry,
oNoGreeting,
oNoOptions,
oHomedir,
@@ -154,6 +155,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oDebugLevel, "debug-level", "@"),
ARGPARSE_s_i (oDebugWait," debug-wait", "@"),
ARGPARSE_s_n (oDebugQuickRandom, "debug-quick-random", "@"),
+ ARGPARSE_s_n (oDebugPinentry, "debug-pinentry", "@"),
ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
ARGPARSE_s_n (oNoGrab, "no-grab", N_("do not grab keyboard and mouse")),
@@ -539,6 +541,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
opt.verbose = 0;
opt.debug = 0;
opt.no_grab = 0;
+ opt.debug_pinentry = 0;
opt.pinentry_program = NULL;
opt.pinentry_touch_file = NULL;
opt.scdaemon_program = NULL;
@@ -567,6 +570,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
case oDebug: opt.debug |= pargs->r.ret_ulong; break;
case oDebugAll: opt.debug = ~0; break;
case oDebugLevel: debug_level = pargs->r.ret_str; break;
+ case oDebugPinentry: opt.debug_pinentry = 1; break;
case oLogFile:
if (!reread)
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 3e77909..469c762 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -301,6 +301,12 @@ down to standard random quality. It is only used for testing and
shall not be used for any production quality keys. This option is
only effective when given on the command line.
+ at item --debug-pinentry
+ at opindex debug-pinentry
+This option enables extra debug information pertaining to the
+Pinentry. As of now it is only useful when used along with
+ at code{--debug 1024}.
+
@item --no-detach
@opindex no-detach
Don't detach the process from the console. This is mainly useful for
@@ -753,6 +759,7 @@ This signal flushes all cached passphrases and if the program has been
started with a configuration file, the configuration file is read
again. Only certain options are honored: @code{quiet},
@code{verbose}, @code{debug}, @code{debug-all}, @code{debug-level},
+ at code{debug-pinentry},
@code{no-grab}, @code{pinentry-program}, @code{default-cache-ttl},
@code{max-cache-ttl}, @code{ignore-cache-for-signing},
@code{no-allow-mark-trusted}, @code{disable-scdaemon}, and
-----------------------------------------------------------------------
Summary of changes:
agent/agent.h | 3 +++
agent/call-pinentry.c | 11 +++++++++--
agent/gpg-agent.c | 4 ++++
doc/gpg-agent.texi | 7 +++++++
4 files changed, 23 insertions(+), 2 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list