gnupg/g10 (ChangeLog apdu.c app-openpgp.c cardglue.c misc.c
options.h)
cvs user wk
cvs at cvs.gnupg.org
Wed Mar 30 12:24:27 CEST 2005
Date: Wednesday, March 30, 2005 @ 12:39:13
Author: wk
Path: /cvs/gnupg/gnupg/g10
Modified: ChangeLog apdu.c app-openpgp.c cardglue.c misc.c options.h
(pin_cb): Print a warning if the info string hack is
not there. This may happen due to typos in the translation.
---------------+
ChangeLog | 11 +++++++++++
apdu.c | 32 ++++++++++++++++----------------
app-openpgp.c | 4 ++--
cardglue.c | 2 ++
misc.c | 2 +-
options.h | 2 +-
6 files changed, 33 insertions(+), 20 deletions(-)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.713 gnupg/g10/ChangeLog:1.714
--- gnupg/g10/ChangeLog:1.713 Mon Mar 21 21:47:28 2005
+++ gnupg/g10/ChangeLog Wed Mar 30 12:39:13 2005
@@ -1,3 +1,14 @@
+2005-03-30 Werner Koch <wk at g10code.com>
+
+ * cardglue.c (pin_cb): Print a warning if the info string hack is
+ not there. This may happen due to typos in the translation.
+
+2005-03-22 Werner Koch <wk at g10code.com>
+
+ * misc.c (w32_shgetfolderpath) [W32]: Changed declaration of
+ function ptr. Noted by Tim Costello.
+ * apdu.c [W32]: Changed declaration of dlopened function pointers.
+
2005-03-21 David Shaw <dshaw at jabberwocky.com>
* gpgv.c: Stubs for tty_enable_completion() &
Index: gnupg/g10/apdu.c
diff -u gnupg/g10/apdu.c:1.19 gnupg/g10/apdu.c:1.20
--- gnupg/g10/apdu.c:1.19 Tue Jan 25 15:18:56 2005
+++ gnupg/g10/apdu.c Wed Mar 30 12:39:13 2005
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: apdu.c,v 1.19 2005/01/25 14:18:56 wk Exp $
+ * $Id: apdu.c,v 1.20 2005/03/30 10:39:13 wk Exp $
*/
#include <config.h>
@@ -150,12 +150,12 @@
/* ct API function pointer. */
-static char (* DLSTDCALL CT_init) (unsigned short ctn, unsigned short Pn);
-static char (* DLSTDCALL CT_data) (unsigned short ctn, unsigned char *dad,
+static char (DLSTDCALL * CT_init) (unsigned short ctn, unsigned short Pn);
+static char (DLSTDCALL * CT_data) (unsigned short ctn, unsigned char *dad,
unsigned char *sad, unsigned short lc,
unsigned char *cmd, unsigned short *lr,
unsigned char *rsp);
-static char (* DLSTDCALL CT_close) (unsigned short ctn);
+static char (DLSTDCALL * CT_close) (unsigned short ctn);
/* PC/SC constants and function pointer. */
#define PCSC_SCOPE_USER 0
@@ -217,46 +217,46 @@
typedef struct pcsc_readerstate_s *pcsc_readerstate_t;
-long (* DLSTDCALL pcsc_establish_context) (unsigned long scope,
+long (DLSTDCALL * pcsc_establish_context) (unsigned long scope,
const void *reserved1,
const void *reserved2,
unsigned long *r_context);
-long (* DLSTDCALL pcsc_release_context) (unsigned long context);
-long (* DLSTDCALL pcsc_list_readers) (unsigned long context,
+long (DLSTDCALL * pcsc_release_context) (unsigned long context);
+long (DLSTDCALL * pcsc_list_readers) (unsigned long context,
const char *groups,
char *readers, unsigned long*readerslen);
-long (* DLSTDCALL pcsc_get_status_change) (unsigned long context,
+long (DLSTDCALL * pcsc_get_status_change) (unsigned long context,
unsigned long timeout,
pcsc_readerstate_t readerstates,
unsigned long nreaderstates);
-long (* DLSTDCALL pcsc_connect) (unsigned long context,
+long (DLSTDCALL * pcsc_connect) (unsigned long context,
const char *reader,
unsigned long share_mode,
unsigned long preferred_protocols,
unsigned long *r_card,
unsigned long *r_active_protocol);
-long (* DLSTDCALL pcsc_reconnect) (unsigned long card,
+long (DLSTDCALL * pcsc_reconnect) (unsigned long card,
unsigned long share_mode,
unsigned long preferred_protocols,
unsigned long initialization,
unsigned long *r_active_protocol);
-long (* DLSTDCALL pcsc_disconnect) (unsigned long card,
+long (DLSTDCALL * pcsc_disconnect) (unsigned long card,
unsigned long disposition);
-long (* DLSTDCALL pcsc_status) (unsigned long card,
+long (DLSTDCALL * pcsc_status) (unsigned long card,
char *reader, unsigned long *readerlen,
unsigned long *r_state,
unsigned long *r_protocol,
unsigned char *atr, unsigned long *atrlen);
-long (* DLSTDCALL pcsc_begin_transaction) (unsigned long card);
-long (* DLSTDCALL pcsc_end_transaction) (unsigned long card);
-long (* DLSTDCALL pcsc_transmit) (unsigned long card,
+long (DLSTDCALL * pcsc_begin_transaction) (unsigned long card);
+long (DLSTDCALL * pcsc_end_transaction) (unsigned long card);
+long (DLSTDCALL * pcsc_transmit) (unsigned long card,
const pcsc_io_request_t send_pci,
const unsigned char *send_buffer,
unsigned long send_len,
pcsc_io_request_t recv_pci,
unsigned char *recv_buffer,
unsigned long *recv_len);
-long (* DLSTDCALL pcsc_set_timeout) (unsigned long context,
+long (DLSTDCALL * pcsc_set_timeout) (unsigned long context,
unsigned long timeout);
Index: gnupg/g10/app-openpgp.c
diff -u gnupg/g10/app-openpgp.c:1.23 gnupg/g10/app-openpgp.c:1.24
--- gnupg/g10/app-openpgp.c:1.23 Tue Jan 25 15:18:55 2005
+++ gnupg/g10/app-openpgp.c Wed Mar 30 12:39:13 2005
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: app-openpgp.c,v 1.23 2005/01/25 14:18:55 wk Exp $
+ * $Id: app-openpgp.c,v 1.24 2005/03/30 10:39:13 wk Exp $
*/
#include <config.h>
@@ -1012,7 +1012,7 @@
else
app->did_chv1 = app->did_chv2 = 0;
- /* Note to translators: Do not translate the "|*|" prefixes but
+ /* TRANSLATORS: Do not translate the "|*|" prefixes but
keep it at the start of the string. We need this elsewhere
to get some infos on the string. */
rc = pincb (pincb_arg, chvno == 3? _("|AN|New Admin PIN") : _("|N|New PIN"),
Index: gnupg/g10/cardglue.c
diff -u gnupg/g10/cardglue.c:1.24 gnupg/g10/cardglue.c:1.25
--- gnupg/g10/cardglue.c:1.24 Mon Mar 14 20:19:20 2005
+++ gnupg/g10/cardglue.c Wed Mar 30 12:39:13 2005
@@ -674,6 +674,8 @@
}
info = ends+1;
}
+ else
+ log_debug ("pin_cb called without proper PIN info hack\n");
again:
if (is_status_enabled())
Index: gnupg/g10/misc.c
diff -u gnupg/g10/misc.c:1.65 gnupg/g10/misc.c:1.66
--- gnupg/g10/misc.c:1.65 Tue Feb 15 12:02:31 2005
+++ gnupg/g10/misc.c Wed Mar 30 12:39:13 2005
@@ -1027,7 +1027,7 @@
w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
{
static int initialized;
- static HRESULT (* WINAPI func)(HWND,int,HANDLE,DWORD,LPSTR);
+ static HRESULT (WINAPI * func)(HWND,int,HANDLE,DWORD,LPSTR);
if (!initialized)
{
Index: gnupg/g10/options.h
diff -u gnupg/g10/options.h:1.134 gnupg/g10/options.h:1.135
--- gnupg/g10/options.h:1.134 Thu Mar 17 23:55:17 2005
+++ gnupg/g10/options.h Wed Mar 30 12:39:13 2005
@@ -223,7 +223,7 @@
#define DBG_TRUST_VALUE 256 /* debug the trustdb */
#define DBG_HASHING_VALUE 512 /* debug hashing operations */
#define DBG_EXTPROG_VALUE 1024 /* debug external program calls */
-#define DBG_CARD_IO_VALUE 2048
+#define DBG_CARD_IO_VALUE 2048 /* debug smart card I/O. */
#define DBG_PACKET (opt.debug & DBG_PACKET_VALUE)
#define DBG_FILTER (opt.debug & DBG_FILTER_VALUE)
More information about the Gnupg-commits
mailing list