security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-29 02:22:45 +02:00
Code Activity

PC/SC cleanup.

Browse Source 
* g10/apdu.c (pcsc_dword_t): New.  It was named as DWORD (double-word)
when a word was 16-bit.
(struct reader_table_s): Fixes for types.
(struct pcsc_readerstate_s) [__APPLE__]: Enable #pragma pack(1).
Throughout: Fixes for types.
--

GnuPG-bug-id: 1358

This is a backport of commit ae22d629b6.
This commit is contained in:
Werner Koch 2014-06-23 09:58:34 +02:00
parent 4239780d5a
commit 60bd6488c0
1 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
g10/apdu.c
View File

@ -83,6 +83,12 @@
#define DLSTDCALL #define DLSTDCALL
#endif #endif
#if defined(__APPLE__) || defined(_WIN32) || defined(__CYGWIN__)
typedef unsinged int pcsc_dword_t;
#else
typedef unsigned long pcsc_dword_t;
#endif
/* Helper to pass parameters related to keypad based operations. */ /* Helper to pass parameters related to keypad based operations. */
struct pininfo_s struct pininfo_s
@ -116,9 +122,9 @@ struct reader_table_s {
ccid_driver_t handle; ccid_driver_t handle;
} ccid; } ccid;
struct { struct {
unsigned long context; long context;
unsigned long card; long card;
unsigned long protocol; pcsc_dword_t protocol;
#ifdef NEED_PCSC_WRAPPER #ifdef NEED_PCSC_WRAPPER
int req_fd; int req_fd;
int rsp_fd; int rsp_fd;
@ -234,60 +240,67 @@ struct pcsc_io_request_s
typedef struct pcsc_io_request_s *pcsc_io_request_t; typedef struct pcsc_io_request_s *pcsc_io_request_t;
#ifdef __APPLE__
# pragma pack(1)
#endif
struct pcsc_readerstate_s struct pcsc_readerstate_s
{ {
const char *reader; const char *reader;
void *user_data; void *user_data;
unsigned long current_state; pcsc_dword_t current_state;
unsigned long event_state; pcsc_dword_t event_state;
unsigned long atrlen; pcsc_dword_t atrlen;
unsigned char atr[33]; unsigned char atr[33];
}; };
#ifdef __APPLE__
# pragma pack()
#endif
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) (pcsc_dword_t scope,
const void *reserved1, const void *reserved1,
const void *reserved2, const void *reserved2,
unsigned long *r_context); long *r_context);
long (* DLSTDCALL pcsc_release_context) (unsigned long context); long (* DLSTDCALL pcsc_release_context) (long context);
long (* DLSTDCALL pcsc_list_readers) (unsigned long context, long (* DLSTDCALL pcsc_list_readers) (long context,
const char *groups, const char *groups,
char *readers, unsigned long*readerslen); char *readers,
long (* DLSTDCALL pcsc_get_status_change) (unsigned long context, pcsc_dword_t *readerslen);
unsigned long timeout, long (* DLSTDCALL pcsc_get_status_change) (long context,
pcsc_dword_t timeout,
pcsc_readerstate_t readerstates, pcsc_readerstate_t readerstates,
unsigned long nreaderstates); pcsc_dword_t nreaderstates);
long (* DLSTDCALL pcsc_connect) (unsigned long context, long (* DLSTDCALL pcsc_connect) (long context,
const char *reader, const char *reader,
unsigned long share_mode, pcsc_dword_t share_mode,
unsigned long preferred_protocols, pcsc_dword_t preferred_protocols,
unsigned long *r_card, long *r_card,
unsigned long *r_active_protocol); pcsc_dword_t *r_active_protocol);
long (* DLSTDCALL pcsc_reconnect) (unsigned long card, long (* DLSTDCALL pcsc_reconnect) (long card,
unsigned long share_mode, pcsc_dword_t share_mode,
unsigned long preferred_protocols, pcsc_dword_t preferred_protocols,
unsigned long initialization, pcsc_dword_t initialization,
unsigned long *r_active_protocol); pcsc_dword_t *r_active_protocol);
long (* DLSTDCALL pcsc_disconnect) (unsigned long card, long (* DLSTDCALL pcsc_disconnect) (long card,
unsigned long disposition); pcsc_dword_t disposition);
long (* DLSTDCALL pcsc_status) (unsigned long card, long (* DLSTDCALL pcsc_status) (long card,
char *reader, unsigned long *readerlen, char *reader, pcsc_dword_t *readerlen,
unsigned long *r_state, pcsc_dword_t *r_state,
unsigned long *r_protocol, pcsc_dword_t *r_protocol,
unsigned char *atr, unsigned long *atrlen); unsigned char *atr, pcsc_dword_t *atrlen);
long (* DLSTDCALL pcsc_begin_transaction) (unsigned long card); long (* DLSTDCALL pcsc_begin_transaction) (long card);
long (* DLSTDCALL pcsc_end_transaction) (unsigned long card, long (* DLSTDCALL pcsc_end_transaction) (long card,
unsigned long disposition); pcsc_dword_t disposition);
long (* DLSTDCALL pcsc_transmit) (unsigned long card, long (* DLSTDCALL pcsc_transmit) (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, pcsc_dword_t 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); pcsc_dword_t *recv_len);
long (* DLSTDCALL pcsc_set_timeout) (unsigned long context, long (* DLSTDCALL pcsc_set_timeout) (long context,
unsigned long timeout); pcsc_dword_t timeout);
/* Prototypes. */ /* Prototypes. */
@ -990,7 +1003,7 @@ pcsc_send_apdu_direct (int slot, unsigned char *apdu, size_t apdulen,
{ {
long err; long err;
struct pcsc_io_request_s send_pci; struct pcsc_io_request_s send_pci;
unsigned long recv_len; pcsc_dword_t recv_len;
if (!reader_table[slot].atrlen if (!reader_table[slot].atrlen
&& (err = reset_pcsc_reader (slot))) && (err = reset_pcsc_reader (slot)))
@ -1276,8 +1289,8 @@ connect_pcsc_card (int slot)
else else
{ {
char reader[250]; char reader[250];
unsigned long readerlen, atrlen; pcsc_dword_t readerlen, atrlen;
unsigned long card_state, card_protocol; long card_state, card_protocol;
atrlen = DIM (reader_table[0].atr); atrlen = DIM (reader_table[0].atr);
readerlen = sizeof reader -1 ; readerlen = sizeof reader -1 ;
@ -1473,7 +1486,7 @@ open_pcsc_reader_direct (const char *portstr)
long err; long err;
int slot; int slot;
char *list = NULL; char *list = NULL;
unsigned long nreader; pcsc_dword_t nreader;
char *p; char *p;
slot = new_reader_slot (); slot = new_reader_slot ();