[git] Pinentry - branch, master, updated. pinentry-0.9.1-13-gda9ec71
by Werner Koch
cvs at cvs.gnupg.org
Tue May 5 09:11:04 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, master has been updated
via da9ec71960fe1257e67f6c282fef432352491945 (commit)
via a616bd9dec00e068185b6b37a35ced4ec12ac5a7 (commit)
from 8b802cf928d199d9c09080f71a7dd1eb397f414a (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 da9ec71960fe1257e67f6c282fef432352491945
Author: Werner Koch <wk at gnupg.org>
Date: Tue May 5 09:10:10 2015 +0200
Remove the Manifest files
--
These files are not in use for more than a decade. Their indented
purpose was to sign source files. With GIT we have a way better
system to detect tampering of the source.
diff --git a/Manifest b/Manifest
deleted file mode 100644
index 6037ada..0000000
--- a/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile.am iQCVAwUAP+gB7zEAnp832S/7AQKBYAP+NkkLjXtfsFDK30uEPHCKlHfYi0Wxj3VuVSatlVtb/O1xBWdAt5ba7spwJPzVXMwgaBWkK6DjQrqR0uLrzWCsSX5ZIJZBoBn557ykyimLXzlb8BrpVsNGloNPIeMyTq9LBOUdgtuJST/rfM03zSjgb8HuY5H1/2/BSwLqt1u02+s==jBz4
-acinclude.m4 iQCVAwUAP+gEuTEAnp832S/7AQLVVgP/XQMjkCJxKmfaPINxF3+OQvi6FIys2FDiwdPa391nbxClEnThSljw8uTcvqr3RXXgL4ORsbv8W+TrXuqlDS5vQ5lxf0oPyvvlGhH1Wt64mDI/gA+zS46Y7lkfcpNIrnh5vYgQJlhlN/v0V4pXkWk/DBFiSNqwMqhSUtxpmlv1LKA==v+vK
-configure.ac iQCVAwUAP+gEpDEAnp832S/7AQIWwgP/RGNMxYCN5alOA9zsjPvXcF4s5LzHox1J41auPurSF7OKRSjDDx37fKHymMAb9Mh+RqzqwtSn+WnzsL1u7qsbS6TS7yJgEzeZAbP2d4m00aEnqF6Qe63E1ss7SKCjpFbe6IdLu+NO9CkDis/UwlYTAjgoO8kh1GgPzPPEv17iKaA==s84Z
-$names$ iQCVAwUAP+gBajEAnp832S/7AQLnygP7BqZ5gdD9oYWEHd5mp6JQdQPiZ5zetxZrUa1IdyoqIusOJ0FkmoUDn+QGhwJgImAn9FnEtMV5uiaZjtFqImFtIR4b/iPL9h89cCi7wTRHL4yjk1qMwa5lBhTa86ZmdEQ6uwFHGRKWjvKr6KVDST10Cal5DscCrTNg9itsdppw+YE==0+Ck
diff --git a/assuan/Manifest b/assuan/Manifest
deleted file mode 100644
index 7bbf2e6..0000000
--- a/assuan/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-Makefile.am
-assuan-buffer.c
-assuan-client.c
-assuan-connect.c
-assuan-defs.h
-assuan-errors.c
-assuan-handler.c
-assuan-inquire.c
-assuan-listen.c
-assuan-pipe-connect.c
-assuan-pipe-server.c
-assuan-socket-connect.c
-assuan-socket-server.c
-assuan-util.c
-assuan.h
-mkerrors
-$names$ iQCVAwUAP+f/pjEAnp832S/7AQLuJAP+MRNJ5zuXNU3znYhBSSb37pqDr3lIjkVrbN+CK4EkEvzcrFFjnpmCs3Hyg371yHM0P0dCRnQ6JW9XPJAtl/93gfNp7Hc6npJenUs3tn4uzlMWf228YW6KrhBXKj9bWyLDiEwsw/alCkBEPBXXXcS54DuESHK5wkljwJlQ93g9wo8==OuBu
diff --git a/curses/Makefile.am b/curses/Makefile.am
index f8fe9eb..404a8ed 100644
--- a/curses/Makefile.am
+++ b/curses/Makefile.am
@@ -7,20 +7,18 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# PINENTRY is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = Manifest
-
bin_PROGRAMS = pinentry-curses
AM_CPPFLAGS = $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry
diff --git a/curses/Manifest b/curses/Manifest
deleted file mode 100644
index c231d84..0000000
--- a/curses/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.am iQCVAwUAP+gA3zEAnp832S/7AQIR/gP7B87t7lRazBHqtbIUkiFfULuv/sxsfyuUADIUmQwoNB5u4823Oc9nMP/XhiktJFWlzHxx5V4+Ijlv0qHwdeaBX3xDAug7eqtZ2/ItxMhCeya6wF93ZO+50jWtH4R0uJEQnV8PV3qOXyH6IX58tBy/uF3aq/jPveR6JxdoPMmv+KQ==3oD+
-pinentry-curses.c iQCVAwUAP+gA8DEAnp832S/7AQK/TAP/ey0ja7arONAcYHJjaU3mX9jKBEoKXR1x5OzZBy7AyusZb9IoPRhHYZShBVl4LCaadrsrKLHUQxHhvgrdK6iNNt1dU5EAFjYAnzyzRJ2QSnZvAgn9KC1pnNeYmRtU+vhV6fwnoxzAjj0MxpC2jzVaIpfKm+RUJoTf270f06/rSW8==NPLk
-$names$ iQCVAwUAP+gAijEAnp832S/7AQIzQwQA2PkXcATQ5mNpLIJ8g1UXFSgQGhZ+h4KkrfzKuogAxeCaTAccLcFRj5DAX8GygQs2IoyZJTSxFaNTMKW48LlDMpnu0/cekN7Rc6v4xp3Wz77Y6bZ2SdyLQw6y0bu8eE+WuUvXjysU/MAqRTB1imhQjhDp+DSw/6cjhd2MF1nrmqc==bfR8
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2f16142..5dc243e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -7,20 +7,18 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# PINENTRY is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = Manifest
-
bin_PROGRAMS = pinentry-gtk
if FALLBACK_CURSES
diff --git a/gtk/Manifest b/gtk/Manifest
deleted file mode 100644
index d3fc619..0000000
--- a/gtk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.am
-gtksecentry.c
-gtksecentry.h
-pinentry-gtk.c
-$names$ iQCVAwUAP+f+sDEAnp832S/7AQJrIQQAttRdNAgDI8z/eQpSs1zDeQTv1mX5f4KjKS6WLlp9y4ZLymb6xgE4+BSeTyDVAwl2FEQNzk2BOoqZ19oTyI4af1p4O1L5qKEIOAKX8tnFKlrSUFbrgLPNMJczw6yZiPD5tnjFpcxtzPqP5+DWAZDs/CVR1xnvI/uD0scLblmrjLk==ohI7
diff --git a/pinentry/Manifest b/pinentry/Manifest
deleted file mode 100644
index 931718e..0000000
--- a/pinentry/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.am
-pinentry-curses.c
-pinentry-curses.h
-pinentry.c
-pinentry.h
-$names$ iQCVAwUAP+f+TjEAnp832S/7AQJmVQQAwoiSGV7KETdwozuwgSn3q5COtv23QmjKQ/EEvegsv+D2UO4S2viohm9C5hRH0RQwYAZwGKpJ7k/8NpWVxBpzKTI1fJ6ZRRis2c/ucBMa4c6TcVgGeh17x6hYqzrc/omafTyHoQBSvMeYptt5zEoWiXbz/n58DpDFDTpydAl4Q60==IlRa
diff --git a/qt/Makefile.am b/qt/Makefile.am
index 6771990..bc344e1 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -19,7 +19,7 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = Manifest README.SecQ
+EXTRA_DIST = README.SecQ
bin_PROGRAMS = pinentry-qt
@@ -44,7 +44,7 @@ pinentry_qt_SOURCES = secqstring.h secqstring.cpp \
secqinternal_p.h secqinternal.cpp \
secqlineedit.h secqlineedit.cpp \
pinentrydialog.h pinentrydialog.cpp \
- main.cpp
+ main.cpp
nodist_pinentry_qt_SOURCES = secqlineedit.moc.cpp \
pinentrydialog.moc.cpp
diff --git a/qt/Manifest b/qt/Manifest
deleted file mode 100644
index 207523a..0000000
--- a/qt/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.am
-main.cpp
-pinentrydialog.cpp
-pinentrydialog.h
-secqlineedit.cpp
-secqlineedit.h
-secqstring.cpp
-secqstring.h
-$names$ iQCVAwUAP+f/ATEAnp832S/7AQI7ogP+NM3/SRwrCt+HcyEuhbuJ0GP5bezLJ5ix4XWjkqtdqqXV+DYNLuXVnrsclKuBgrKB2oPYdfakl8WXrI/Gl1GBM2/MZ0jYNtnZZuzfIqPXN4eKZTdlvry7DbE6hshUU/jTJHfRgOrLoRlO0hn+aikrQi2efJ5HzaOknE/5rjVX63Y==K3Gm
diff --git a/secmem/Makefile.am b/secmem/Makefile.am
index 3575faa..e5e0711 100644
--- a/secmem/Makefile.am
+++ b/secmem/Makefile.am
@@ -7,20 +7,18 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# PINENTRY is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = Manifest
-
noinst_LIBRARIES = libsecmem.a
libsecmem_a_SOURCES = \
diff --git a/secmem/Manifest b/secmem/Manifest
deleted file mode 100644
index a37366d..0000000
--- a/secmem/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile.am
-memory.h
-secmem-util.h
-secmem.c
-util.c
-util.h
-$names$ iQCVAwUAP+f/RDEAnp832S/7AQIbRQQAzR7UvGOTMl8AWyVgHGQjW5A5fGzRlaEABl+5UpGmzoFGFdP9upHv3Tj0MKETHNRkdOAA5k5QzamDypAr5RINz9rdZPkNPIAtg4csN7Yb6ITJZaH7yLDJcBmhM49a8ZNpDpQeImzpE05cM6TuGVO6NSIrlt9OBhaHfbkpzgr1tI0==6Tyw
diff --git a/w32/Makefile.am b/w32/Makefile.am
index b2e2f8f..f15e66c 100644
--- a/w32/Makefile.am
+++ b/w32/Makefile.am
@@ -7,20 +7,18 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# PINENTRY is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = Manifest
-
bin_PROGRAMS = pinentry-w32
AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem \
@@ -36,5 +34,5 @@ pinentry_w32_LDADD = pinentry-w32.o \
pinentry-w32.o: pinentry-w32.rc resource.h
- $(WINDRES) -I.. -v -o $@ $<
+ $(WINDRES) -I.. -v -o $@ $<
diff --git a/w32/Manifest b/w32/Manifest
deleted file mode 100644
index 85ffc67..0000000
--- a/w32/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.am
-$names$
commit a616bd9dec00e068185b6b37a35ced4ec12ac5a7
Author: Werner Koch <wk at gnupg.org>
Date: Tue May 5 09:03:30 2015 +0200
pinentry-tty: Fix problem with zero length prompt.
* tty/pinentry-tty.c (read_password): Use default prompt also for an
empty prompt argument.
--
strlen(prompt)-1 is used thus we need to make sure that
the length is > 0.
diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c
index 548c51d..5891697 100644
--- a/tty/pinentry-tty.c
+++ b/tty/pinentry-tty.c
@@ -76,7 +76,7 @@ confirm (pinentry_t pinentry, FILE *ttyfi, FILE *ttyfo)
}
return 0;
}
-
+
static int
read_password (pinentry_t pinentry, FILE *ttyfi, FILE *ttyfo)
@@ -94,7 +94,7 @@ read_password (pinentry_t pinentry, FILE *ttyfi, FILE *ttyfo)
}
prompt = pinentry->prompt;
- if (! prompt)
+ if (! prompt || !*prompt)
prompt = "PIN";
fprintf (ttyfo, "%s\n%s%s ",
@@ -228,7 +228,7 @@ tty_cmd_handler(pinentry_t pinentry)
}
do_touch_file (pinentry);
}
-
+
if (pinentry->ttyname)
{
fclose (ttyfi);
-----------------------------------------------------------------------
Summary of changes:
Manifest | 4 ----
assuan/Manifest | 17 -----------------
curses/Makefile.am | 6 ++----
curses/Manifest | 3 ---
gtk/Makefile.am | 6 ++----
gtk/Manifest | 5 -----
pinentry/Manifest | 6 ------
qt/Makefile.am | 4 ++--
qt/Manifest | 9 ---------
secmem/Makefile.am | 6 ++----
secmem/Manifest | 7 -------
tty/pinentry-tty.c | 6 +++---
w32/Makefile.am | 8 +++-----
w32/Manifest | 2 --
14 files changed, 14 insertions(+), 75 deletions(-)
delete mode 100644 Manifest
delete mode 100644 assuan/Manifest
delete mode 100644 curses/Manifest
delete mode 100644 gtk/Manifest
delete mode 100644 pinentry/Manifest
delete mode 100644 qt/Manifest
delete mode 100644 secmem/Manifest
delete mode 100644 w32/Manifest
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list