GNUPG-1-9-BRANCH gnupg (6 files)
cvs user wk
cvs at cvs.gnupg.org
Sun Dec 19 14:33:40 CET 2004
Date: Sunday, December 19, 2004 @ 14:38:24
Author: wk
Path: /cvs/gnupg/gnupg
Tag: GNUPG-1-9-BRANCH
Modified: agent/gpg-agent.c common/ChangeLog common/maperror.c
jnlib/ChangeLog jnlib/w32-pth.c sm/keylist.c
* maperror.c (map_assuan_err_with_source): Oops, args were swapped.
* w32-pth.c (pth_init): Enable debugging depending on env var.
-------------------+
agent/gpg-agent.c | 6 ++++++
common/ChangeLog | 4 ++++
common/maperror.c | 2 +-
jnlib/ChangeLog | 4 ++++
jnlib/w32-pth.c | 26 +++++++++++++++++++-------
sm/keylist.c | 4 ++--
6 files changed, 36 insertions(+), 10 deletions(-)
Index: gnupg/agent/gpg-agent.c
diff -u gnupg/agent/gpg-agent.c:1.31.2.25 gnupg/agent/gpg-agent.c:1.31.2.26
--- gnupg/agent/gpg-agent.c:1.31.2.25 Sat Dec 18 19:53:32 2004
+++ gnupg/agent/gpg-agent.c Sun Dec 19 14:38:24 2004
@@ -437,14 +437,20 @@
/* Libgcrypt requires us to register the threading model first.
Note that this will also do the pth_init. */
#ifdef USE_GNU_PTH
+#ifdef HAVE_W32_SYSTEM
+ /* For W32 we need pth. */
+ pth_init ();
+#else
err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
if (err)
{
log_fatal ("can't register GNU Pth with Libgcrypt: %s\n",
gpg_strerror (err));
}
+#endif
#endif /*USE_GNU_PTH*/
+
/* Check that the libraries are suitable. Do it here because
the option parsing may need services of the library. */
if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
Index: gnupg/common/ChangeLog
diff -u gnupg/common/ChangeLog:1.30.2.35 gnupg/common/ChangeLog:1.30.2.36
--- gnupg/common/ChangeLog:1.30.2.35 Sat Dec 18 11:22:10 2004
+++ gnupg/common/ChangeLog Sun Dec 19 14:38:24 2004
@@ -1,3 +1,7 @@
+2004-12-19 Werner Koch <wk at g10code.com>
+
+ * maperror.c (map_assuan_err_with_source): Oops, args were swapped.
+
2004-12-18 Werner Koch <wk at g10code.com>
* maperror.c (map_assuan_err): Renamed to ..
Index: gnupg/common/maperror.c
diff -u gnupg/common/maperror.c:1.18.2.6 gnupg/common/maperror.c:1.18.2.7
--- gnupg/common/maperror.c:1.18.2.6 Sat Dec 18 11:22:10 2004
+++ gnupg/common/maperror.c Sun Dec 19 14:38:24 2004
@@ -38,7 +38,7 @@
simple: All errors with a gpg_err_source of UNKNOWN are genuine
Assuan codes all others are passed verbatim through. */
gpg_error_t
-map_assuan_err_with_source (int err, int source)
+map_assuan_err_with_source (int source, int err)
{
gpg_err_code_t ec;
Index: gnupg/jnlib/ChangeLog
diff -u gnupg/jnlib/ChangeLog:1.3.2.28 gnupg/jnlib/ChangeLog:1.3.2.29
--- gnupg/jnlib/ChangeLog:1.3.2.28 Sat Dec 18 19:53:32 2004
+++ gnupg/jnlib/ChangeLog Sun Dec 19 14:38:24 2004
@@ -1,3 +1,7 @@
+2004-12-19 Werner Koch <wk at g10code.com>
+
+ * w32-pth.c (pth_init): Enable debugging depending on env var.
+
2004-12-18 Werner Koch <wk at g10code.com>
* w32-pth.c (pth_init): Reverse return values. Use TRUE and FALSE
Index: gnupg/jnlib/w32-pth.c
diff -u gnupg/jnlib/w32-pth.c:1.1.2.8 gnupg/jnlib/w32-pth.c:1.1.2.9
--- gnupg/jnlib/w32-pth.c:1.1.2.8 Sat Dec 18 19:53:32 2004
+++ gnupg/jnlib/w32-pth.c Sun Dec 19 14:38:24 2004
@@ -40,6 +40,9 @@
#define W32_PTH_HANDLE_INTERNAL HANDLE
#include "w32-pth.h"
+#define DEBUG_ENTER_LEAVE 1 /* Set to 1 to enable full debugging. */
+
+
#ifndef FALSE
#define FALSE 0
#endif
@@ -51,12 +54,15 @@
#endif
+/* States whether trhis module has been initialized. */
+static int pth_initialized;
-static int pth_initialized = 0;
+/* Controls whether debugging is enabled. */
+static int debug_enter_leave;
/* Variables to support event handling. */
-static int pth_signo = 0;
-static HANDLE pth_signo_ev = NULL;
+static int pth_signo;
+static HANDLE pth_signo_ev;
/* Mutex to make sure only one thread is running. */
static CRITICAL_SECTION pth_shd;
@@ -124,6 +130,8 @@
return TRUE;
fprintf (stderr, "%s: pth_init: called.\n", log_get_prefix (NULL));
+ debug_enter_leave = !!getenv ("DEBUG_PTH");
+
if (WSAStartup (0x202, &wsadat))
return FALSE;
pth_signo = 0;
@@ -177,8 +185,9 @@
{
/* Fixme: I am not sure whether the same thread my enter a critical
section twice. */
-/* fprintf (stderr, "%s: enter_pth (%s)\n",
- log_get_prefix (NULL), function? function:""); */
+ if (debug_enter_leave)
+ fprintf (stderr, "%s: enter_pth (%s)\n",
+ log_get_prefix (NULL), function? function:"");
LeaveCriticalSection (&pth_shd);
}
@@ -187,8 +196,9 @@
leave_pth (const char *function)
{
EnterCriticalSection (&pth_shd);
-/* fprintf (stderr, "%s: leave_pth (%s)\n",
- log_get_prefix (NULL), function? function:""); */
+ if (debug_enter_leave)
+ fprintf (stderr, "%s: leave_pth (%s)\n",
+ log_get_prefix (NULL), function? function:"");
}
@@ -296,6 +306,8 @@
fprintf (stderr, "%s: pth_write(%d) failed in write: %s\n",
log_get_prefix (NULL), fd,
w32_strerror (strerr, sizeof strerr));
+ fprintf (stderr, "--> fd = %d, handle = %p, size = %lu\n",
+ fd, (HANDLE)fd, size);
n = -1;
}
else
Index: gnupg/sm/keylist.c
diff -u gnupg/sm/keylist.c:1.25.2.18 gnupg/sm/keylist.c:1.25.2.19
--- gnupg/sm/keylist.c:1.25.2.18 Thu Sep 30 15:24:31 2004
+++ gnupg/sm/keylist.c Sun Dec 19 14:38:24 2004
@@ -1149,8 +1149,8 @@
char *p = gpgsm_get_keygrip_hexstring (cert);
if (p)
{
- rc = gpgsm_agent_havekey (ctrl, p);
- if (!rc)
+ rc = gpgsm_agent_havekey (ctrl, p);
+ if (!rc)
have_secret = 1;
else if ( gpg_err_code (rc) != GPG_ERR_NO_SECKEY)
goto leave;
More information about the Gnupg-commits
mailing list