[git] Pinentry - branch, neal/next, updated. pinentry-0.9.2-21-g74522a2
by Neal H. Walfield
cvs at cvs.gnupg.org
Sat May 16 14:59:51 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 standard pinentry collection".
The branch, neal/next has been updated
discards 5b7201d27a29ce8f5bbe8f3e14d8516381d29cab (commit)
via 74522a268398c7d8726e659bd71301b1a09eb6ea (commit)
via 7e571da7f9c9c18448d43f5da00de527c0cfb617 (commit)
via 9fdb05554b5fc9c6f6621d606ccf21c038c7b6cb (commit)
via 222866894993041ceaca3ca4ef33373ab78bfdff (commit)
via 3d97b18ba928677550a8f7eaa938551aad42dacf (commit)
via 21e83f422667e431c1283b9ae3356fded3523e50 (commit)
via 4549998627ee04e74f8d1c94aef55e3ed17f14d9 (commit)
via c68a6854aadaf8c271648f369f14b4943e684ecf (commit)
via 960317ec86c06bc737e1ff3c1b571dc8f4194763 (commit)
via dd0307be51587a9a7866981ce00eed474bee6e14 (commit)
via 496235af8dfd373b54e5610f86bf1cada175ac23 (commit)
via 3062742b945f95d72001896f8ba5468b9e63aa9b (commit)
via bdd81974633f8e31d582b62999ef9b004bc3b95e (commit)
via ae7dfae00df81a683adf0292a52b63632491319e (commit)
via 2582cb9eb23ca287520caa04a12f83f10c268f71 (commit)
via be87785005d256b7f3dacc607ba5ea0a14de8593 (commit)
via 14b95bd6d92ba699c3d263ac1f9140973d8c9156 (commit)
via 831782b3b625ca81624fae0ee184da0d2fc46d96 (commit)
via 29236f84aca64be72c97a9b5513457a4e45afbc6 (commit)
via aa04dac66f2ee949e8789a3c91090b01646f2e57 (commit)
via 72939ea63564deec029e8e43743762fdb48cb6e8 (commit)
via 8e52ddc874838ad512ed76cdc1c34057da328fba (commit)
via bf71ac5a685afacb98f6c4c6a86c9d27d5414beb (commit)
via 726c00514be4a0c2831dd775e306f7d5243bab8b (commit)
via d7f2081fdd605b0d0789bcb6984decfea3777f23 (commit)
via 319e1a32e3ab67cb0624c0586d7519c16c76d43b (commit)
via 3d02645d757e573e4628a1caf2e36bb92d523e77 (commit)
via 1a8af55b76d8235ce891f44808064e7f846e193c (commit)
via 09203147bef487c9a85f55f8cc96d265197b0bf5 (commit)
via 3a8daef81c49dc3c04b6703a0384381cb43eb91b (commit)
via c6eaa7bf8300f524de41956a339ca0ed3af4656e (commit)
via aa98f25ddcc3c36035f18249443cec15d16e8fa5 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (5b7201d27a29ce8f5bbe8f3e14d8516381d29cab)
\
N -- N -- N (74522a268398c7d8726e659bd71301b1a09eb6ea)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 74522a268398c7d8726e659bd71301b1a09eb6ea
Author: Neal H. Walfield <neal at gnu.org>
Date: Sat May 16 14:57:29 2015 +0200
Reinitialize PINENTRY when the Assuan RESET command is invoke.
* pinentry/pinentry.c (pinentry_loop2): Register pinentry_reset as the
assuan reset handler.
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index c4afeb2..4df93ed 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -1318,6 +1318,7 @@ pinentry_loop2 (int infd, int outfd)
#if 0
assuan_set_log_stream (ctx, stderr);
#endif
+ assuan_register_reset_notify (ctx, pinentry_reset);
pinentry_reset (NULL);
for (;;)
commit 7e571da7f9c9c18448d43f5da00de527c0cfb617
Author: Neal H. Walfield <neal at gnu.org>
Date: Sat May 16 14:56:27 2015 +0200
Don't use a static initializer to initialize PINENTRY.
* pinentry/pinentry.c (pinentry): Don't use a static initializer.
(pinentry_reset): Initialize PINENTRY here.
(pinentry_loop2): Call pinentry_reset here.
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 78ac137..c4afeb2 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -57,59 +57,50 @@
/* Keep the name of our program here. */
static char this_pgmname[50];
+struct pinentry pinentry;
-struct pinentry pinentry =
- {
- NULL, /* Title. */
- NULL, /* Description. */
- NULL, /* Error. */
- NULL, /* Prompt. */
- NULL, /* Ok button. */
- NULL, /* Not-Ok button. */
- NULL, /* Cancel button. */
- NULL, /* PIN. */
- 0, /* PIN length. */
- 0, /* pin_from_cache. */
- 0, /* Display. */
- 0, /* TTY name. */
- 0, /* TTY type. */
- 0, /* TTY LC_CTYPE. */
- 0, /* TTY LC_MESSAGES. */
- 0, /* Debug mode. */
- 60, /* Pinentry timeout in seconds. */
-#ifdef ENABLE_ENHANCED
- 0, /* Enhanced mode. */
-#endif
- 1, /* Global grab. */
- 0, /* Parent Window ID. */
- NULL, /* Touch file. */
- 0, /* Result. */
- 0, /* Canceled. */
- 0, /* Close button flag. */
- 0, /* Locale error flag. */
- 0, /* Specific error flag. */
- 0, /* One-button flag. */
- NULL, /* Repeat passphrase flag. */
- NULL, /* Repeat error string. */
- 0, /* Correctly repeated flag. */
- NULL, /* Quality-Bar flag and description. */
- NULL, /* Quality-Bar tooltip. */
- PINENTRY_COLOR_DEFAULT,
- 0,
- PINENTRY_COLOR_DEFAULT,
- PINENTRY_COLOR_DEFAULT,
- 0,
- NULL, /* default_ok */
- NULL, /* default_cancel */
- NULL, /* default_prompt */
- NULL, /* default_pwmngr */
- 0, /* allow_external_password_cache. */
- 0, /* tried_password_cached. */
- NULL, /* keyinfo */
- 0, /* may_cache_password. */
- NULL /* Assuan context. */
- };
-
+static void
+pinentry_reset (ASSUAN_CONTEXT ctx)
+{
+ /* Free any allocated strings. */
+ free (pinentry.title);
+ free (pinentry.description);
+ free (pinentry.error);
+ free (pinentry.prompt);
+ free (pinentry.ok);
+ free (pinentry.notok);
+ free (pinentry.cancel);
+ secmem_free (pinentry.pin);
+ free (pinentry.display);
+ free (pinentry.ttyname);
+ free (pinentry.ttytype);
+ free (pinentry.lc_ctype);
+ free (pinentry.lc_messages);
+ free (pinentry.touch_file);
+ free (pinentry.repeat_passphrase);
+ free (pinentry.repeat_error_string);
+ free (pinentry.quality_bar);
+ free (pinentry.quality_bar_tt);
+ free (pinentry.default_ok);
+ free (pinentry.default_cancel);
+ free (pinentry.default_prompt);
+ free (pinentry.default_pwmngr);
+ free (pinentry.keyinfo);
+
+ memset (&pinentry, 0, sizeof (pinentry));
+
+ /* Pinentry timeout in seconds. */
+ pinentry.timeout = 60;
+
+ /* Global grab. */
+ pinentry.grab = 1;
+
+ pinentry.color_fg = PINENTRY_COLOR_DEFAULT;
+ pinentry.color_fg_bright = 0;
+ pinentry.color_bg = PINENTRY_COLOR_DEFAULT;
+ pinentry.color_so = PINENTRY_COLOR_DEFAULT;
+ pinentry.color_so_bright = 0;
+}
static int lc_ctype_unknown_warning = 0;
@@ -1327,6 +1318,7 @@ pinentry_loop2 (int infd, int outfd)
#if 0
assuan_set_log_stream (ctx, stderr);
#endif
+ pinentry_reset (NULL);
for (;;)
{
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 1 +
Makefile.am | 11 +-
NEWS | 15 +-
assuan/assuan.h | 9 +-
autogen.rc | 4 +-
configure.ac | 68 +++++++--
curses/Makefile.am | 5 +-
doc/pinentry.texi | 210 +++++++++++++++++++++++++--
{gtk => gnome3}/Makefile.am | 16 +-
gnome3/pinentry-gnome3.c | 271 ++++++++++++++++++++++++++++++++++
gtk+-2/Makefile.am | 5 +-
gtk+-2/gtksecentry.c | 7 +
gtk+-2/pinentry-gtk-2.c | 23 ++-
pinentry/password-cache.c | 44 +++---
pinentry/password-cache.h | 4 +-
pinentry/pinentry-curses.c | 61 ++++++--
pinentry/pinentry.c | 243 +++++++++++++++++++------------
pinentry/pinentry.h | 92 ++++++++----
qt4/Makefile.am | 10 +-
tty/Makefile.am | 6 +-
tty/pinentry-tty.c | 347 +++++++++++++++++++++++++++++++++++++-------
21 files changed, 1194 insertions(+), 258 deletions(-)
copy {gtk => gnome3}/Makefile.am (80%)
create mode 100644 gnome3/pinentry-gnome3.c
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list