security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Make bug reporting address easier changeable.

Browse Source
This commit is contained in:
Werner Koch 2009-07-21 14:21:05 +00:00
parent 7ae15f0027
commit 0792525d22
20 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -1,7 +1,7 @@
Program: GnuPG Program: GnuPG
Homepage: http://www.gnupg.org Homepage: http://www.gnupg.org
Maintainer: Werner Koch <wk@gnupg.org> Maintainer: Werner Koch <wk@gnupg.org>
Bug reports: <bug-gnupg@gnu.org> Bug reports: http://bugs.gnupg.org
Security related bug reports: <security@gnupg.org> Security related bug reports: <security@gnupg.org>
License: GPLv3+ License: GPLv3+

1
THANKS
View File

@ -118,6 +118,7 @@ Jeffery Von Ronne jronne at ics.uci.edu
Jens Bachem bachem at rrz.uni-koeln.de Jens Bachem bachem at rrz.uni-koeln.de
Jens Seidel jensseidel at users.sf.net Jens Seidel jensseidel at users.sf.net
Jeroen C. van Gelderen jeroen at vangelderen.org Jeroen C. van Gelderen jeroen at vangelderen.org
Jeroen Schot schot at a-eskwadraat nl
J Horacio MG homega at ciberia.es J Horacio MG homega at ciberia.es
J. Michael Ashley jashley at acm.org J. Michael Ashley jashley at acm.org
Jim Bauer jfbauer at home.com Jim Bauer jfbauer at home.com

7
agent/gpg-agent.c
View File

@ -326,8 +326,11 @@ my_strusage (int level)
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); /* TRANSLATORS: @EMAIL@ will get replaced by the actual bug
break; reporting address. This is so that we can change the
reporting address without breaking the translations. */
case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
case 20: case 20:
if (!ver_gcry) if (!ver_gcry)
ver_gcry = make_libversion ("libgcrypt", gcry_check_version); ver_gcry = make_libversion ("libgcrypt", gcry_check_version);

4
agent/preset-passphrase.c
View File

@ -91,8 +91,8 @@ my_strusage (int level)
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: case 40:
p = _("Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"); p = _("Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n");

4
agent/protect-tool.c
View File

@ -157,8 +157,8 @@ my_strusage (int level)
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: p = _("Usage: gpg-protect-tool [options] (-h for help)\n"); case 40: p = _("Usage: gpg-protect-tool [options] (-h for help)\n");
break; break;

2
configure.ac
View File

@ -31,7 +31,7 @@ m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
AC_INIT([gnupg], AC_INIT([gnupg],
[my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])], [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
[bug-gnupg@gnupg.org]) [http://bugs.gnupg.org])
# Set development_version to yes if the minor number is odd or you # Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not # feel that the default check for a development version is not
# sufficient. # sufficient.

4
g10/gpg.c
View File

@ -804,9 +804,7 @@ my_strusage( int level )
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
_("Please report bugs to <gnupg-bugs@gnu.org>.\n");
break;
case 20: case 20:
if (!ver_gcry) if (!ver_gcry)

4
g10/gpgv.c
View File

@ -111,8 +111,8 @@ my_strusage( int level )
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <gnupg-bugs@gnu.org>.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: p = _("Usage: gpgv [options] [files] (-h for help)"); case 40: p = _("Usage: gpgv [options] [files] (-h for help)");
break; break;

5
kbx/kbxutil.c
View File

@ -110,9 +110,8 @@ my_strusage( int level )
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
_("Please report bugs to " PACKAGE_BUGREPORT ".\n");
break;
case 1: case 1:
case 40: p = case 40: p =
_("Usage: kbxutil [options] [files] (-h for help)"); _("Usage: kbxutil [options] [files] (-h for help)");

10
scd/ChangeLog
View File

@ -1,3 +1,13 @@
2009-07-21 Werner Koch <wk@g10code.com>
* ccid-driver.c [HAVE_PTH]: Include pth.h.
(my_sleep): New.
(bulk_in): s/gnupg_sleep/my_sleep/.
2009-07-20 Werner Koch <wk@g10code.com>
* apdu.c [GNUPG_MAJOR_VERSION==1]: Include dynload.h.
2009-07-16 Werner Koch <wk@g10code.com> 2009-07-16 Werner Koch <wk@g10code.com>
* command.c (update_reader_status_file): Test for unplugged reader. * command.c (update_reader_status_file): Test for unplugged reader.

1
scd/apdu.c
View File

@ -54,6 +54,7 @@
#include "memory.h" #include "memory.h"
#include "util.h" #include "util.h"
#include "i18n.h" #include "i18n.h"
#include "dynload.h"
#include "cardglue.h" #include "cardglue.h"
#else /* GNUPG_MAJOR_VERSION != 1 */ #else /* GNUPG_MAJOR_VERSION != 1 */
#include "scdaemon.h" #include "scdaemon.h"

39
scd/ccid-driver.c
View File

@ -85,6 +85,9 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <time.h> #include <time.h>
#ifdef HAVE_PTH
# include <pth.h>
#endif /*HAVE_PTH*/
#include <usb.h> #include <usb.h>
@ -311,6 +314,30 @@ set_msg_len (unsigned char *msg, unsigned int length)
} }
static void
my_sleep (int seconds)
{
#ifdef HAVE_PTH
/* With Pth we also call the standard sleep(0) so that the process
may give up its timeslot. */
if (!seconds)
{
# ifdef HAVE_W32_SYSTEM
Sleep (0);
# else
sleep (0);
# endif
}
pth_sleep (seconds);
#else
# ifdef HAVE_W32_SYSTEM
Sleep (seconds*1000);
# else
sleep (seconds);
# endif
#endif
}
static void static void
print_progress (ccid_driver_t handle) print_progress (ccid_driver_t handle)
{ {
@ -1766,8 +1793,8 @@ bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen,
{ {
int rc; int rc;
/* No need to continue and clutter the log withy USB error if we /* No need to continue and clutter the log with USB write error
ever got an ENODEV. */ messages after we got the first ENODEV. */
if (handle->enodev_seen) if (handle->enodev_seen)
return CCID_DRIVER_ERR_NO_READER; return CCID_DRIVER_ERR_NO_READER;
@ -1900,9 +1927,7 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
DEBUGOUT_1 ("usb_bulk_read error: %s\n", strerror (rc)); DEBUGOUT_1 ("usb_bulk_read error: %s\n", strerror (rc));
if (rc == EAGAIN && eagain_retries++ < 3) if (rc == EAGAIN && eagain_retries++ < 3)
{ {
#ifndef TEST my_sleep (1);
gnupg_sleep (1);
#endif
goto retry; goto retry;
} }
return CCID_DRIVER_ERR_CARD_IO_ERROR; return CCID_DRIVER_ERR_CARD_IO_ERROR;
@ -1919,9 +1944,7 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
handle->dev_fd, strerror (rc)); handle->dev_fd, strerror (rc));
if (rc == EAGAIN && eagain_retries++ < 5) if (rc == EAGAIN && eagain_retries++ < 5)
{ {
#ifndef TEST my_sleep (1);
gnupg_sleep (1);
#endif
goto retry; goto retry;
} }
return CCID_DRIVER_ERR_CARD_IO_ERROR; return CCID_DRIVER_ERR_CARD_IO_ERROR;

4
scd/sc-copykeys.c
View File

@ -76,8 +76,8 @@ my_strusage (int level)
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: p = _("Usage: sc-copykeys [options] (-h for help)\n"); case 40: p = _("Usage: sc-copykeys [options] (-h for help)\n");
break; break;

4
scd/scdaemon.c
View File

@ -242,8 +242,8 @@ my_strusage (int level)
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 20: case 20:
if (!ver_gcry) if (!ver_gcry)
ver_gcry = make_libversion ("libgcrypt", gcry_check_version); ver_gcry = make_libversion ("libgcrypt", gcry_check_version);

4
sm/gpgsm.c
View File

@ -509,8 +509,8 @@ my_strusage( int level )
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: p = _("Usage: gpgsm [options] [files] (-h for help)"); case 40: p = _("Usage: gpgsm [options] [files] (-h for help)");
break; break;

4
tools/gpg-check-pattern.c
View File

@ -138,8 +138,8 @@ my_strusage (int level)
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: case 40:
p = _("Usage: gpg-check-pattern [options] patternfile (-h for help)\n"); p = _("Usage: gpg-check-pattern [options] patternfile (-h for help)\n");

4
tools/gpg-connect-agent.c
View File

@ -177,8 +177,8 @@ my_strusage( int level )
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: p = _("Usage: gpg-connect-agent [options] (-h for help)"); case 40: p = _("Usage: gpg-connect-agent [options] (-h for help)");
break; break;

4
tools/gpgconf.c
View File

@ -99,8 +99,8 @@ my_strusage( int level )
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: p = _("Usage: gpgconf [options] (-h for help)"); case 40: p = _("Usage: gpgconf [options] (-h for help)");
break; break;

5
tools/gpgsplit.c
View File

@ -85,9 +85,8 @@ my_strusage (int level)
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
"Please report bugs to <bug-gnupg@gnu.org>.\n";
break;
case 1: case 1:
case 40: p = case 40: p =
"Usage: gpgsplit [options] [files] (-h for help)"; "Usage: gpgsplit [options] [files] (-h for help)";

4
tools/symcryptrun.c
View File

@ -201,8 +201,8 @@ my_strusage (int level)
break; break;
case 13: p = VERSION; break; case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break; case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
break;
case 1: case 1:
case 40: p = _("Usage: symcryptrun [options] (-h for help)"); case 40: p = _("Usage: symcryptrun [options] (-h for help)");
break; break;