[git] GnuPG - branch, master, updated. gnupg-2.1.18-129-gfd9cb9f
by Werner Koch
cvs at cvs.gnupg.org
Wed Feb 22 18:59:53 CET 2017
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 fd9cb9f8152158b81c2aaef6e9c65cfdd763a0d1 (commit)
via f98c8cb013033c08e98ebedcc0e084fbd2a85b0c (commit)
via 7ccabbc26a2fd0d18fef4f4f15731377b514c97d (commit)
from 468dbc74d2a07a095911f334213bb82d97fc1ff6 (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 fd9cb9f8152158b81c2aaef6e9c65cfdd763a0d1
Author: Werner Koch <wk at gnupg.org>
Date: Wed Feb 22 18:56:42 2017 +0100
po: Adjust the German translation.
--
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/po/de.po b/po/de.po
index c72fe49..165dade 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2017-02-22 16:21+0100\n"
+"PO-Revision-Date: 2017-02-22 18:55+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -2395,7 +2395,8 @@ msgstr ""
"einem \"Keygrip\" aus\n"
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
-msgstr "WARNING: Kein Kommando angegeben. Versuche zu raten was gemeint ist ...\n"
+msgstr ""
+"WARNING: Kein Kommando angegeben. Versuche zu raten was gemeint ist ...\n"
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
@@ -6220,13 +6221,16 @@ msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
msgid "reading public key failed: %s\n"
msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
+#. TRANSLATORS: Put a \x1f right before a colon. This can be
+#. * used by pinentry to nicely align the names and values. Keep
+#. * the %s at the start and end of the string.
#, c-format
-msgid "Number:\t%s%%0AHolder:\t%s%%0ASignatures:\t%lu"
-msgstr "Nummer:\t%s%%0ABesitzer:\t%s%%0ASignaturen:\t%lu"
+msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+msgstr "%sNummer : %s%%0ABesitzer : %s%%0AAnzahl : %lu%s"
#, c-format
-msgid "Number:\t%s%%0AHolder:\t%s"
-msgstr "Nummer:\t%s%%0ABesitzer:\t%s"
+msgid "%sNumber : %s%%0AHolder : %s%s"
+msgstr "%sNummer : %s%%0ABesitzer : %s%s"
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
commit f98c8cb013033c08e98ebedcc0e084fbd2a85b0c
Author: Werner Koch <wk at gnupg.org>
Date: Wed Feb 22 16:54:32 2017 +0100
scd,agent: Improve the OpenPGP PIN prompt texts.
* scd/app-openpgp.c (get_prompt_info): Change texts.
* agent/call-pinentry.c (struct entry_features): New.
(getinfo_features_cb): New.
(start_pinentry): Set new fucntion as status callback.
(build_cmd_setdesc): New. Replace all snprintf for SETDESC by this
one.
--
Suggested-by: Andre Heinecke
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 9931665..0af1854 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -56,6 +56,17 @@
/* The assuan context of the current pinentry. */
static assuan_context_t entry_ctx;
+/* A list of features of the current pinentry. */
+static struct
+{
+ /* The Pinentry support RS+US tabbing. This means that a RS (0x1e)
+ * starts a new tabbing block in which a US (0x1f) followed by a
+ * colon marks a colon. A pinentry can use this to pretty print
+ * name value pairs. */
+ unsigned int tabbing:1;
+} entry_features;
+
+
/* The control variable of the connection owning the current pinentry.
This is only valid if ENTRY_CTX is not NULL. Note, that we care
only about the value of the pointer and that it should never be
@@ -208,6 +219,31 @@ atfork_cb (void *opaque, int where)
}
+/* Status line callback for the FEATURES status. */
+static gpg_error_t
+getinfo_features_cb (void *opaque, const char *line)
+{
+ const char *args;
+ char **tokens;
+ int i;
+
+ (void)opaque;
+
+ if ((args = has_leading_keyword (line, "FEATURES")))
+ {
+ tokens = strtokenize (args, " ");
+ if (!tokens)
+ return gpg_error_from_syserror ();
+ for (i=0; tokens[i]; i++)
+ if (!strcmp (tokens[i], "tabbing"))
+ entry_features.tabbing = 1;
+ xfree (tokens);
+ }
+
+ return 0;
+}
+
+
static gpg_error_t
getinfo_pid_cb (void *opaque, const void *buffer, size_t length)
{
@@ -567,13 +603,17 @@ start_pinentry (ctrl_t ctrl)
/* Ask the pinentry for its version and flavor and store that as a
* string in MB. This information is useful for helping users to
- * figure out Pinentry problems. */
+ * figure out Pinentry problems. Noet that "flavor" may also return
+ * a status line with the features; we use a dedicated handler for
+ * that. */
{
membuf_t mb;
init_membuf (&mb, 256);
if (assuan_transact (entry_ctx, "GETINFO flavor",
- put_membuf_cb, &mb, NULL, NULL, NULL, NULL))
+ put_membuf_cb, &mb,
+ NULL, NULL,
+ getinfo_features_cb, NULL))
put_membuf_str (&mb, "unknown");
put_membuf_str (&mb, " ");
if (assuan_transact (entry_ctx, "GETINFO version",
@@ -871,6 +911,25 @@ pinentry_status_cb (void *opaque, const char *line)
}
+/* Build a SETDESC command line. This is a dedicated funcion so that
+ * it can remove control characters which are not supported by the
+ * current Pinentry. */
+static void
+build_cmd_setdesc (char *line, size_t linelen, const char *desc)
+{
+ char *src, *dst;
+
+ snprintf (line, linelen, "SETDESC %s", desc);
+ if (!entry_features.tabbing)
+ {
+ /* Remove RS and US. */
+ for (src=dst=line; *src; src++)
+ if (!strchr ("\x1e\x1f", *src))
+ *dst++ = *src;
+ *dst = 0;
+ }
+}
+
/* Call the Entry and ask for the PIN. We do check for a valid PIN
@@ -961,7 +1020,7 @@ agent_askpin (ctrl_t ctrl,
if (rc && gpg_err_code (rc) != GPG_ERR_ASS_UNKNOWN_CMD)
return unlock_pinentry (rc);
- snprintf (line, DIM(line), "SETDESC %s", desc_text);
+ build_cmd_setdesc (line, DIM(line), desc_text);
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
if (rc)
return unlock_pinentry (rc);
@@ -1170,7 +1229,7 @@ agent_get_passphrase (ctrl_t ctrl,
if (desc)
- snprintf (line, DIM(line), "SETDESC %s", desc);
+ build_cmd_setdesc (line, DIM(line), desc);
else
snprintf (line, DIM(line), "RESET");
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -1258,7 +1317,7 @@ agent_get_confirmation (ctrl_t ctrl,
return rc;
if (desc)
- snprintf (line, DIM(line), "SETDESC %s", desc);
+ build_cmd_setdesc (line, DIM(line), desc);
else
snprintf (line, DIM(line), "RESET");
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -1331,7 +1390,7 @@ agent_show_message (ctrl_t ctrl, const char *desc, const char *ok_btn)
return rc;
if (desc)
- snprintf (line, DIM(line), "SETDESC %s", desc);
+ build_cmd_setdesc (line, DIM(line), desc);
else
snprintf (line, DIM(line), "RESET");
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -1401,7 +1460,7 @@ agent_popup_message_start (ctrl_t ctrl, const char *desc, const char *ok_btn)
return rc;
if (desc)
- snprintf (line, DIM(line), "SETDESC %s", desc);
+ build_cmd_setdesc (line, DIM(line), desc);
else
snprintf (line, DIM(line), "RESET");
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 90c2661..5e75d4b 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1986,19 +1986,30 @@ get_prompt_info (app_t app, int chvno, unsigned long sigcount, int remaining)
disp_name = get_disp_name (app);
if (chvno == 1)
{
- result = xtryasprintf (_("Card number:\t%s%%0A"
- "Signatures:\t%lu%%0A"
- "Cardholder:\t%s"),
+ /* TRANSLATORS: Put a \x1f right before a colon. This can be
+ * used by pinentry to nicely align the names and values. Keep
+ * the %s at the start and end of the string. */
+ result = xtryasprintf (_("%s"
+ "Number\x1f: %s%%0A"
+ "Holder\x1f: %s%%0A"
+ "Counter\x1f: %lu"
+ "%s"),
+ "\x1e",
serial,
+ disp_name? disp_name:"",
sigcount,
- disp_name? disp_name:"");
+ "");
}
else
{
- result = xtryasprintf (_("Card number:\t%s%%0A"
- "Cardholder:\t%s"),
+ result = xtryasprintf (_("%s"
+ "Number\x1f: %s%%0A"
+ "Holder\x1f: %s"
+ "%s"),
+ "\x1e",
serial,
- disp_name? disp_name:"");
+ disp_name? disp_name:"",
+ "");
}
xfree (disp_name);
xfree (serial);
commit 7ccabbc26a2fd0d18fef4f4f15731377b514c97d
Author: Werner Koch <wk at gnupg.org>
Date: Wed Feb 22 18:49:43 2017 +0100
Revert "scd: Nitpicks on the improved card prompts"
--
This reverts commit 143ca039e1e81140ae520cc1025f8e25c01acc80.
I have a more improved version in the works.
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index f68d8bb..90c2661 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1986,17 +1986,17 @@ get_prompt_info (app_t app, int chvno, unsigned long sigcount, int remaining)
disp_name = get_disp_name (app);
if (chvno == 1)
{
- result = xtryasprintf (_("Number:\t%s%%0A"
- "Holder:\t%s%%0A"
- "Signatures:\t%lu"),
+ result = xtryasprintf (_("Card number:\t%s%%0A"
+ "Signatures:\t%lu%%0A"
+ "Cardholder:\t%s"),
serial,
- disp_name? disp_name:"",
- sigcount);
+ sigcount,
+ disp_name? disp_name:"");
}
else
{
- result = xtryasprintf (_("Number:\t%s%%0A"
- "Holder:\t%s"),
+ result = xtryasprintf (_("Card number:\t%s%%0A"
+ "Cardholder:\t%s"),
serial,
disp_name? disp_name:"");
}
-----------------------------------------------------------------------
Summary of changes:
agent/call-pinentry.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++-----
po/de.po | 16 ++++++-----
scd/app-openpgp.c | 25 +++++++++++++-----
3 files changed, 94 insertions(+), 20 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list