squashme

Upstream version 0.9.3

This is probably just a workaround. Proper fix is being investigated.
See:
https://bugzilla.redhat.com/show_bug.cgi?id=589532
http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdia
--

GnuPG-bug-id: 1981

* m4/pkg.m4: Print the moule name not the variable name.
--

We now show

  checking for ncursesw... no
  checking for ncurses... yes

instead of

  checking for ncurses... no
  checking for ncurses... yes

--

qt/ was the QT3 version.

--

--

* pinentry/password-cache.c (password_cache_clear): s/debug/g_debug/.
* pinentry/pinentry-curses.c (dialog_input): Actually bail out.
(dialog_run) [!HAVE_NCURSESW]: Define alt.

* gtk+-2/pinentry-gtk-2.c (create_window): Make sure the check button
to save the passphrase externally is not checked by default.

* pinentry/password-cache.c (password_cache_clear): New function.
* pinentry/password-cache.h (password_cache_clear): New declaration.
* pinentry/pinentry.c (cmd_getinfo): New function.
(register_commands): Have the Assuan command "CLEARPASSPHRASE" call
it.

* pinentry/pinentry.c (cmd_getpin): If PINENTRY.ERROR is not NULL,
don't read the password from the cache.

* pinentry/pinentry-curses.c (MAKE_BUTTON): When creating the button
text, respect underscores.

* pinentry/pinentry-curses.c (dialog_input): Make control-l repaint
the screen.

* pinentry/pinentry-curses.c (dialog_input): Add control-h an alias
for backspace.

* m4/curses.m4: When checking for ncurses, first try using
PKG_CHECK_MODULES.

--
Patch-By: Alon Bar-Lev

* gtk+-2/pinentry-gtk-2.c (main): Use gtk_init_check instead of
gtk_init.  If gtk_init_check fails, fallback to the curses backend.

--

Reported-by: Daniel Kahn Gillmorr <dkg@fifthhorseman.net>.  Closes
issue #1982.

* pinentry/pinentry-curses.c (dialog_input): Take additional argument,
alt.  Update callers.  If passed control-u, erase the whole line.  If
passed alt-backspace or control-w, erase any white space the the
previous word.
(dialog_run): Detect when alt is pressed.

* secmem/secmem.c (secmem_malloc): In case wipememory2 gets optimized
away in secmem_free, clear the buffer before returning it.

* pinentry/pinentry-curses.c (dialog_run): NUL terminate the pin entry
buffer.

* pinentry/pinentry-curses.c (dialog_input): Make sure the pin entry
buffer is large enough.

* pinentry/pinentry-curses.c (struct dialog): Remove field pin.  Add
field pinentry.
(dialog_create): Don't set DIALOG->PIN to PINENTRY->PIN.  Set
DIALOG->PINENTRY to PINENTRY and access PIN via
DIALOG->PINENTRY->PIN.  Update other users.

* gtk+-2/pinentry-gtk-2.c (timeout_source): New variable.
(timeout_cb): Set it to 0.
(create_window): When setting up the timeout, save the source
identifier in TIMEOUT_SOURCE.
(gtk_cmd_handler): If TIMEOUT_SOURCE is not 0, remove the timeout.

--
Reported-by: Daniel Kahn Gillmorr <dkg@fifthhorseman.net&gt;.>

* pinentry/pinentry-curses.c (dialog_run) [! HAVE_DOSISH_SYSTEM]: If
an error occurs while reading input, cancel the operation.

Patch-by: Julien Cristau and Daniel Kahn Gillmor.

* tty/pinentry-tty.c (confirm): When creating the ok button,
pinentry->ok takes precedence over pinentry->default-ok.  Likewise for
pinentry->cancel and pinentry->default_cancel.

* pinentry/pinentry.c (pinentry): Don't use a static initializer.
(pinentry_reset): Initialize PINENTRY here.
(pinentry_parse_opts): Call pinentry_reset here.
(pinentry_assuan_reset_handler): New function.
(pinentry_loop2): Register it as the assuan reset handler.

* pinentry/pinentry.c (lc_ctype_unknown_warning): New variable.
(pinentry_utf8_to_local): Only emit the LC_CTYPE warning if
lc_ctype_unknown_warning is not set.  After emitted such a warning,
set lc_ctype_unknown_warning.
(pinentry_local_to_utf8): Likewise.

* pinentry/pinentry-curses.c (default_notok): New macro.
(MAKE_BUTTON): Also check if default variant is set.

* pinentry/pinentry-curses.c (dialog_create): Don't show the notok
button in pin entry mode.

* pinentry/pinentry-curses.c [HAVE_NCURSESW]: Include <ncursesw/curses.h>.
[! HAVE_NCURSESW]: Only include <curses.h> in this case.

--

When built with libncursesw, we see this problem:

pinentry-curses.c:440:8: warning: implicit declaration of function ‘addnwstr’ [-Wimplicit-function-declaration]
        ADDCH (start[i]);
        ^

* tty/pinentry-tty.c: Include "memory.h".
(read_password): Break into two functions: read_password and password.
(read_password): Just read the password from the terminal and return
it in secure memory (or NULL if the user canceled the entry or there
was an error).
(password): Improve output.  Handle the repeat passphrase case (i.e.,
when pinentry->repeat_passphrase is set).
* tty/Makefile.am (AM_CPPFLAGS): Add "-I$(top_srcdir)/secmem".