security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

(pin_cb): Print a warning if the info string hack is

Browse Source 
not there.  This may happen due to typos in the translation.
This commit is contained in:
Werner Koch 2005-03-30 10:39:13 +00:00
parent 4d5285ee87
commit 1985805cdf
6 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/ChangeLog
View File

@ -1,3 +1,14 @@
2005-03-30 Werner Koch <wk@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@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@jabberwocky.com> 2005-03-21 David Shaw <dshaw@jabberwocky.com>
* gpgv.c: Stubs for tty_enable_completion() & * gpgv.c: Stubs for tty_enable_completion() &

30
g10/apdu.c
View File

@ -150,12 +150,12 @@ static struct reader_table_s reader_table[MAX_READER];
/* ct API function pointer. */ /* ct API function pointer. */
static char (* DLSTDCALL CT_init) (unsigned short ctn, unsigned short Pn); 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_data) (unsigned short ctn, unsigned char *dad,
unsigned char *sad, unsigned short lc, unsigned char *sad, unsigned short lc,
unsigned char *cmd, unsigned short *lr, unsigned char *cmd, unsigned short *lr,
unsigned char *rsp); 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. */ /* PC/SC constants and function pointer. */
#define PCSC_SCOPE_USER 0 #define PCSC_SCOPE_USER 0
@ -217,46 +217,46 @@ struct pcsc_readerstate_s
typedef struct pcsc_readerstate_s *pcsc_readerstate_t; 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 *reserved1,
const void *reserved2, const void *reserved2,
unsigned long *r_context); unsigned long *r_context);
long (* DLSTDCALL pcsc_release_context) (unsigned long context); long (DLSTDCALL * pcsc_release_context) (unsigned long context);
long (* DLSTDCALL pcsc_list_readers) (unsigned long context, long (DLSTDCALL * pcsc_list_readers) (unsigned long context,
const char *groups, const char *groups,
char *readers, unsigned long*readerslen); 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, unsigned long timeout,
pcsc_readerstate_t readerstates, pcsc_readerstate_t readerstates,
unsigned long nreaderstates); unsigned long nreaderstates);
long (* DLSTDCALL pcsc_connect) (unsigned long context, long (DLSTDCALL * pcsc_connect) (unsigned long context,
const char *reader, const char *reader,
unsigned long share_mode, unsigned long share_mode,
unsigned long preferred_protocols, unsigned long preferred_protocols,
unsigned long *r_card, unsigned long *r_card,
unsigned long *r_active_protocol); 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 share_mode,
unsigned long preferred_protocols, unsigned long preferred_protocols,
unsigned long initialization, unsigned long initialization,
unsigned long *r_active_protocol); unsigned long *r_active_protocol);
long (* DLSTDCALL pcsc_disconnect) (unsigned long card, long (DLSTDCALL * pcsc_disconnect) (unsigned long card,
unsigned long disposition); unsigned long disposition);
long (* DLSTDCALL pcsc_status) (unsigned long card, long (DLSTDCALL * pcsc_status) (unsigned long card,
char *reader, unsigned long *readerlen, char *reader, unsigned long *readerlen,
unsigned long *r_state, unsigned long *r_state,
unsigned long *r_protocol, unsigned long *r_protocol,
unsigned char *atr, unsigned long *atrlen); unsigned char *atr, unsigned long *atrlen);
long (* DLSTDCALL pcsc_begin_transaction) (unsigned long card); long (DLSTDCALL * pcsc_begin_transaction) (unsigned long card);
long (* DLSTDCALL pcsc_end_transaction) (unsigned long card); long (DLSTDCALL * pcsc_end_transaction) (unsigned long card);
long (* DLSTDCALL pcsc_transmit) (unsigned long card, long (DLSTDCALL * pcsc_transmit) (unsigned long card,
const pcsc_io_request_t send_pci, const pcsc_io_request_t send_pci,
const unsigned char *send_buffer, const unsigned char *send_buffer,
unsigned long send_len, unsigned long send_len,
pcsc_io_request_t recv_pci, pcsc_io_request_t recv_pci,
unsigned char *recv_buffer, unsigned char *recv_buffer,
unsigned long *recv_len); unsigned long *recv_len);
long (* DLSTDCALL pcsc_set_timeout) (unsigned long context, long (DLSTDCALL * pcsc_set_timeout) (unsigned long context,
unsigned long timeout); unsigned long timeout);

2
g10/app-openpgp.c
View File

@ -1012,7 +1012,7 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr, int reset_mode,
else else
app->did_chv1 = app->did_chv2 = 0; 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 keep it at the start of the string. We need this elsewhere
to get some infos on the string. */ to get some infos on the string. */
rc = pincb (pincb_arg, chvno == 3? _("|AN|New Admin PIN") : _("|N|New PIN"), rc = pincb (pincb_arg, chvno == 3? _("|AN|New Admin PIN") : _("|N|New PIN"),

2
g10/cardglue.c
View File

@ -674,6 +674,8 @@ pin_cb (void *opaque, const char *info, char **retstr)
} }
info = ends+1; info = ends+1;
} }
else
log_debug ("pin_cb called without proper PIN info hack\n");
again: again:
if (is_status_enabled()) if (is_status_enabled())

2
g10/misc.c
View File

@ -1027,7 +1027,7 @@ static HRESULT
w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e) w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
{ {
static int initialized; static int initialized;
static HRESULT (* WINAPI func)(HWND,int,HANDLE,DWORD,LPSTR); static HRESULT (WINAPI * func)(HWND,int,HANDLE,DWORD,LPSTR);
if (!initialized) if (!initialized)
{ {

2
g10/options.h
View File

@ -223,7 +223,7 @@ struct {
#define DBG_TRUST_VALUE 256 /* debug the trustdb */ #define DBG_TRUST_VALUE 256 /* debug the trustdb */
#define DBG_HASHING_VALUE 512 /* debug hashing operations */ #define DBG_HASHING_VALUE 512 /* debug hashing operations */
#define DBG_EXTPROG_VALUE 1024 /* debug external program calls */ #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_PACKET (opt.debug & DBG_PACKET_VALUE)
#define DBG_FILTER (opt.debug & DBG_FILTER_VALUE) #define DBG_FILTER (opt.debug & DBG_FILTER_VALUE)