Signed-off-by: Werner Koch <wk@gnupg.org>

* tty/pinentry-tty.c (password): Print any supplied error message.

* tty/pinentry-tty.c (dump_error_text): New function to display error
messages.
(confirm): Use it.
(password): Likewise.

* pinentry/pinentry.h (pinetry_loop2): Clarify comment.

* qt/main.cpp: Import static platform plugins when necessary.

--
As pkg-config does not expose all libraries needed to link
qt5 statically with this patch it is possible to get a
static build by setting the LIBS variable correctly.

* m4/libassuan.m4: Respect SYSROOT Variable.

--
This change makes the libassuan lookup work similar
to the libgpg-error lookup simplifying cross-compiling
a bit.

* pinentry/pinentry.c (pinentry_loop2): Use assuan_fdopen for pipe fds.
* pinentry/pinentry.h (pinentry_loop2): Mention this in the comment.

--
For Windows calling assuan_fdopen is neccessary as this does
some internal platform specific stuff (get_osfilehandle).

This issue was introduced by using the real libassuan instead
of the built in variant.

* tty/pinentry-tty.c (password): If the user repeated the passphrase
and they matched, then set PINENTRY->REPEAT_OKAY.

* tty/pinentry-tty.c (read_password): Fix buffer resizing bug.

* qt4: Moved to qt.
* Makefile.am: Change qt4 suffix to qt.
* m4/qt.m4: Remove old qt lookup functions.
  (FIND_QT): New. Use pkg-config to find either Qt5 or Qt4
* configure.ac: Change qt4 suffix to qt. Use new FIND_QT function.
* qt/Makefile.am: Change qt4 suffix to qt. Use new FLAGS / LIBS.
* qt/pinentrydialog.cpp, qt/qrc_pinentry.cpp: Fix whitespace.
* .gitignore: Change qt4 paths to qt.
* README: Update accordingly.
* autogen.rc: Change qt4 to qt.
* qt/main.cpp (qt_cmd_handler, main): Change qt4 to qt.
--

Now if Qt5 is found with pkg-config Qt5 is used. Qt4 is still
supported as a fallback in case Qt5 is not found.

GnuPG-bug-id: 1806

* doc/pinentry.texi: Describe the frontends and their security
implications.

GnuPG-bug-id: 2034

* configure.ac: Remove enable-pinentry-qt4-clipboard option.
* qt4/qsecurelineedit.cpp, qt4/qsecurelineedit.h,
  qt4/qsecurelineedit_p.h, qt4/secstring.cpp,
  qt4/secstring.h: Removed.
* qt4/Makefile.am: Update accordingly.
* qt4/main.cpp (qt_cmd_handler): Use QString instead of secqstring.
* qt4/pinentrydialog.cpp (PinentryDialog::PinentryDialog),
  (PinEntryDialog::error, PinEntryDialog::pin),
  (PinEntryDialog::updateQuality): Use QLineEdit and QString
  instead of secmem variants.
* qt4/pinentrydialog.cpp (PinentryDialog::PinentryDialog):
  Set echo mode to password.
* qt4/pinentrydialog.h: Update accordingly.

* gtk+-2/pinentry-gtk-2.c (make_transient): Don't directly access the
window field of WIN.  Use gtk_widget_get_window instead.
(grab_keyboard): Likewise.
(ungrab_keyboard): Likewise.

Patch-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com&gt;.>

* gtk+-2/pinentry-gtk-2.c (tooltips): Don't declare for Gtk+ >=2.12.0.
(create_window): Gtk+ >=2.12.0, use gtk_widget_set_tooltip_text
instead of gtk_tooltips_set_tip.

Patch-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com&gt;.>

* gtk+-2/Makefile.am (pinentry_gtk_2_SOURCES): Remove gtksecentry.c,
gtksecentry.h and gseal-gtk-compat.h.
* gtk+-2/gseal-gtk-compat.h: Remove file.
* gtk+-2/gtksecentry.c: Remove file.
* gtk+-2/gtksecentry.h: Remove file.
* gtk+-2/pinentry-gtk-2.c: Don't include "gtksecentry.h".
(button_clicked): Use gtk_entry_get_text instead of
gtk_secure_entry_get_text.
(changed_text_handler): Use gtk_entry_get_text instead of
gtk_secure_entry_get_text and use gtk_entry_set_text instead of
gtk_secure_entry_set_text.
(create_window): Use gtk_entry_new instead of gtk_secure_entry_new.
Disable text visibility on ENTRY and REPEAT_ENTRY.
(main): Don't override the memory allocation functions.

* gtk+-2/pinentry-gtk-2.c (create_window): Don't have ENTRY or
REPEAT_ENTRY explicitly grab the focus.  The default is fine.  Don't
add the GDK_ENTER_NOTIFY_MASK and GDK_LEAVE_NOTIFY_MASK events to
QUALITYBAR.  Only set GTK_CAN_DEFAULT on the ok button.  In pin entry
mode, make the ok button the default.

* gtk+-2/pinentry-gtk-2.c (enter_callback): Rename anentry to
next_widget.  If NEXT_WIDGET is not NULL, send the focus to it.
Otherwise, call button_clicked.
(create_window): Initialize repeat_entry to NULL.  When connecting the
enter_callback entry to REPEAT_ENTRY, set the user data paramter to
NULL.  Connect the entry_callback entry to ENTRY after initializing
REPEAT_ENTRY (if applicable) and set the user data parameter to
REPEAT_ENTRY.

* gtk+-2/pinentry-gtk-2.c (confirm_mode): New global static.
(confirm_button_clicked): Fold this function...
(button_clicked): ... into this one.  Update all callers.
(create_window): Remove argument confirm_mode.
(gtk_cmd_handler): Set confirm_mode.

--

* autogen.rc: Add gpg-error and libassuan prefix options.
* w32/Makefile.am (AM_CPPFLAGS): Use COMMON_FLAGS.
(pinentry_w32_LDADD): Use COMMON_LIBS.

* pinentry/pinentry-curses.c: pkg-config finds the correct include
paths so should not hard-wire the path for the ncursesw header file.

* emacs/Makefile.am (LDADD): Don't link against ../assuan/libassuan.a.
We now use the system libassuan.

* pinentry/pinentry-curses.c (dialog_input): Recognize ASCII DEL as
backspace.

--
Reported-by chdiza
GnuPG-bug-id: 2020

* configure.ac: Add --enable-pinentry-emacs and
--enable-inside-emacs option.
(BUILD_LIBPINENTRY_EMACS): New conditional.
(BUILD_PINENTRY_EMACS): New conditional.
(INSIDE_EMACS): New conditional.
* Makefile.am (pinentry_emacs): New.
(SUBDIRS): Add "emacs" subdir if PINENTRY_EMACS is set.

* pinentry/pinentry-emacs.h: New file.
* pinentry/pinentry-emacs.c: New file.
* pinentry/Makefile.am: New file.
* pinentry/pinentry.c (option_handler): Handle the allow-emacs-prompt
Assuan option.

* emacs/pinentry-emacs.c: New file.
* emacs/Makefile.am: New file.

* gnome3/pinentry-gnome3.c (main): Use gtk_init_check instead of
gtk_init.  If it fails, fallback to the curses frontend.

* pinentry/pinentry.h (pinentry_cmd_handler_t): Fix comment.

* doc/pinentry.texi (Implementation Details): Describe default-prompt.

* assuan/ChangeLog-old: Remove file.
* assuan/Makefile.am: Remove file.
* assuan/README.1st: Remove file.
* assuan/assuan-buffer.c: Remove file.
* assuan/assuan-defs.h: Remove file.
* assuan/assuan-handler.c: Remove file.
* assuan/assuan-listen.c: Remove file.
* assuan/assuan-pipe-server.c: Remove file.
* assuan/assuan-util.c: Remove file.
* assuan/assuan.h: Remove file.
* assuan/mkerrors: Remove file.

* configure.ac: Check for libgpg-error and libassuan.
(COMMON_CFLAGS): Add $GPG_ERROR_CFLAGS and $LIBASSUAN_CFLAGS.
(COMMAND_LIBS): Add $GPG_ERROR_LIBS and $LIBASSUAN_LIBS.
(GPG_ERR_ENABLE_GETTEXT_MACROS): Define this macro.
(GPG_ERR_ENABLE_ERRNO_MACROS): Likewise.
(GNUPG_LIBASSUAN_VERSION): Likewise.
(AC_CONFIG_FILES): Don't generate assuan/Makefile.
(config.h): Define GPG_ERR_SOURCE_DEFAULT.
* Makefile.am (SUBDIRS): Remove assuan.
* curses/Makefile.am (LDADD): Remove ../assuan/libassuan.a.
* gnome3/Makefile.am (AM_CPPFLAGS): Remove -I$(...

* qt4/qsecurelineedit.cpp (QSecureLineEdit::sizeHint),
(QSecureLineEdit::minimumSizeHint): Remove unused Q_D macros.
(QSecureLineEdit::setCursorPosition, QSecureLineEditPrivate::setText),
(QSecureLineEditPrivate::hasAcceptableInput): Explicitly cast length to int.
(QSecureLineEditPrivate::maskString): Use unsigned type for strIndex.
(QSecureLineEditPrivate::maskString): Remove uneccesary casts.
* qt4/secstring.cpp (toUtf8): Remove unused variable.

* gnome3/pinentry-gnome3.c (create_prompt) [HAVE_LIBSECRET]: Only show
the libsecret prompt in this case.
(gnome3_cmd_handler) [HAVE_LIBSECRET]: Set PE->MAY_CACHE_PASSWORD
according to the user's choice.

--

* secmem/secmem.c (secmem_malloc): Only clear the user memory; don't
clear beyond the end of the buffer.

* pinentry/pinentry.c (pinentry_setbufferlen): When the pin buffer is
already large enough, return the buffer instead of NULL.

--

Signed-Off-By: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Debian-Bug-Id: 787639