security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

scd: PC/SC cleanup.

Browse source 
* scd/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.

* scd/pcsc-wrapper.c: Likewise.

--

Problem reported for 1.4.x by the issue 1358.
This commit is contained in:
NIIBE Yutaka 2013-03-22 10:41:59 +09:00
parent a75a08d6e3
commit ee95c23fcd
2 changed files with 137 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

118
scd/pcsc-wrapper.c
View file

@ -65,6 +65,12 @@
static int verbose;
#if defined(__APPLE__) || defined(_WIN32) || defined(__CYGWIN__)
typedef unsinged int pcsc_dword_t;
#else
typedef unsigned long pcsc_dword_t;
#endif
/* PC/SC constants and function pointer. */
#define PCSC_SCOPE_USER 0
@ -112,16 +118,24 @@ struct pcsc_io_request_s {
typedef struct pcsc_io_request_s *pcsc_io_request_t;
#ifdef __APPLE__
#pragma pack(1)
#endif
struct pcsc_readerstate_s
{
const char *reader;
void *user_data;
unsigned long current_state;
unsigned long event_state;
unsigned long atrlen;
pcsc_dword_t current_state;
pcsc_dword_t event_state;
pcsc_dword_t atrlen;
unsigned char atr[33];
};
#ifdef __APPLE__
#pragma pack()
#endif
typedef struct pcsc_readerstate_s *pcsc_readerstate_t;
@ -129,62 +143,62 @@ static int driver_is_open; /* True if the PC/SC driver has been
initialzied and is ready for
operations. The following variables
are then valid. */
static unsigned long pcsc_context; /* The current PC/CS context. */
static long pcsc_context; /* The current PC/CS context. */
static char *current_rdrname;
static unsigned long pcsc_card;
static unsigned long pcsc_protocol;
static long pcsc_card;
static pcsc_dword_t pcsc_protocol;
static unsigned char current_atr[33];
static size_t current_atrlen;
long (* pcsc_establish_context) (unsigned long scope,
long (* pcsc_establish_context) (pcsc_dword_t scope,
const void *reserved1,
const void *reserved2,
unsigned long *r_context);
long (* pcsc_release_context) (unsigned long context);
long (* pcsc_list_readers) (unsigned long context,
long *r_context);
long (* pcsc_release_context) (long context);
long (* pcsc_list_readers) (long context,
const char *groups,
char *readers, unsigned long*readerslen);
long (* pcsc_get_status_change) (unsigned long context,
unsigned long timeout,
char *readers, pcsc_dword_t *readerslen);
long (* pcsc_get_status_change) (long context,
pcsc_dword_t timeout,
pcsc_readerstate_t readerstates,
unsigned long nreaderstates);
long (* pcsc_connect) (unsigned long context,
pcsc_dword_t nreaderstates);
long (* pcsc_connect) (long context,
const char *reader,
unsigned long share_mode,
unsigned long preferred_protocols,
unsigned long *r_card,
unsigned long *r_active_protocol);
long (* pcsc_reconnect) (unsigned long card,
unsigned long share_mode,
unsigned long preferred_protocols,
unsigned long initialization,
unsigned long *r_active_protocol);
long (* pcsc_disconnect) (unsigned long card,
unsigned long disposition);
long (* 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 (* pcsc_begin_transaction) (unsigned long card);
long (* pcsc_end_transaction) (unsigned long card,
unsigned long disposition);
long (* pcsc_transmit) (unsigned long card,
pcsc_dword_t share_mode,
pcsc_dword_t preferred_protocols,
long *r_card,
pcsc_dword_t *r_active_protocol);
long (* pcsc_reconnect) (long card,
pcsc_dword_t share_mode,
pcsc_dword_t preferred_protocols,
pcsc_dword_t initialization,
pcsc_dword_t *r_active_protocol);
long (* pcsc_disconnect) (long card,
pcsc_dword_t disposition);
long (* pcsc_status) (long card,
char *reader, pcsc_dword_t *readerlen,
pcsc_dword_t *r_state,
pcsc_dword_t *r_protocol,
unsigned char *atr, pcsc_dword_t *atrlen);
long (* pcsc_begin_transaction) (long card);
long (* pcsc_end_transaction) (long card,
pcsc_dword_t disposition);
long (* pcsc_transmit) (long card,
const pcsc_io_request_t send_pci,
const unsigned char *send_buffer,
unsigned long send_len,
pcsc_dword_t send_len,
pcsc_io_request_t recv_pci,
unsigned char *recv_buffer,
unsigned long *recv_len);
long (* pcsc_set_timeout) (unsigned long context,
unsigned long timeout);
long (* pcsc_control) (unsigned long card,
unsigned long control_code,
pcsc_dword_t *recv_len);
long (* pcsc_set_timeout) (long context,
pcsc_dword_t timeout);
long (* pcsc_control) (long card,
pcsc_dword_t control_code,
const void *send_buffer,
unsigned long send_len,
pcsc_dword_t send_len,
void *recv_buffer,
unsigned long recv_len,
unsigned long *bytes_returned);
pcsc_dword_t recv_len,
pcsc_dword_t *bytes_returned);
@ -394,9 +408,9 @@ handle_open (unsigned char *argbuf, size_t arglen)
long err;
const char * portstr;
char *list = NULL;
unsigned long nreader, atrlen;
pcsc_dword_t nreader, atrlen;
char *p;
unsigned long card_state, card_protocol;
pcsc_dword_t card_state, card_protocol;
unsigned char atr[33];
/* Make sure there is only the port string */
@ -492,7 +506,7 @@ handle_open (unsigned char *argbuf, size_t arglen)
if (!err)
{
char reader[250];
unsigned long readerlen;
pcsc_dword_t readerlen;
atrlen = 33;
readerlen = sizeof reader -1;
@ -626,8 +640,8 @@ handle_reset (unsigned char *argbuf, size_t arglen)
{
long err;
char reader[250];
unsigned long nreader, atrlen;
unsigned long card_state, card_protocol;
pcsc_dword_t nreader, atrlen;
pcsc_dword_t card_state, card_protocol;
(void)argbuf;
(void)arglen;
@ -697,7 +711,7 @@ handle_transmit (unsigned char *argbuf, size_t arglen)
{
long err;
struct pcsc_io_request_s send_pci;
unsigned long recv_len;
pcsc_dword_t recv_len;
unsigned char buffer[1024];
/* The apdu should at least be one byte. */
@ -737,8 +751,8 @@ static void
handle_control (unsigned char *argbuf, size_t arglen)
{
long err;
unsigned long ioctl_code;
unsigned long recv_len = 1024;
pcsc_dword_t ioctl_code;
pcsc_dword_t recv_len = 1024;
unsigned char buffer[1024];
if (arglen < 4)