[git] GnuPG - branch, master, updated. gnupg-2.1.17-13-gf9882d8
by NIIBE Yutaka
cvs at cvs.gnupg.org
Wed Dec 28 03:26:33 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via f9882d8336feea96e3b5e250e9093f8cca01e08b (commit)
from c7ec9c42246033e14ebad679d11f3b1fbeed23b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f9882d8336feea96e3b5e250e9093f8cca01e08b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Dec 28 11:14:29 2016 +0900
scd: Simplify monitoring card removal.
* scd/apdu.c (struct reader_table_s): Remove any_status, last_status,
status, and change_counter field.
(new_reader_slot, dump_reader_status, ct_activate_card, open_ct_reader)
(connect_pcsc_card, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
(open_ccid_reader, apdu_reset): Follow the change.
(ct_dump_reader_status): Remove.
(apdu_get_status_internal, apdu_get_status): Remove CHANGED arg.
(apdu_connect): Follow the change.
* scd/command.c (struct vreader_s): Remove reset_failed, any, and
changed field.
(cmd_getinfo, update_reader_status_file): Follow the change.
--
In the past, scdaemon monitors card insertion (as well as removal), so
the code has been complicated, and there has been duplication in two
layers. Now, it only monitors card removal, it's now simplified.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/scd/apdu.c b/scd/apdu.c
index b32fe80..177cd8e 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -134,9 +134,6 @@ struct reader_table_s {
} rapdu;
#endif /*USE_G10CODE_RAPDU*/
char *rdrname; /* Name of the connected reader or NULL if unknown. */
- int any_status; /* True if we have seen any status. */
- int last_status;
- int status;
int is_t0; /* True if we know that we are running T=0. */
int is_spr532; /* True if we know that the reader is a SPR532. */
int pinpad_varlen_supported; /* True if we know that the reader
@@ -146,7 +143,6 @@ struct reader_table_s {
size_t atrlen; /* A zero length indicates that the ATR has
not yet been read; i.e. the card is not
ready for use. */
- unsigned int change_counter;
#ifdef USE_NPTH
int lock_initialized;
npth_mutex_t lock;
@@ -217,7 +213,7 @@ static char (* DLSTDCALL CT_close) (unsigned short ctn);
#define PCSC_STATE_ATRMATCH 0x0040 /* ATR matches card. */
#define PCSC_STATE_EXCLUSIVE 0x0080 /* Exclusive Mode. */
#define PCSC_STATE_INUSE 0x0100 /* Shared mode. */
-#define PCSC_STATE_MUTE 0x0200 /* Unresponsive card. */
+#define PCSC_STATE_MUTE 0x0200 /* Unresponsive card. */
#ifdef HAVE_W32_SYSTEM
# define PCSC_STATE_UNPOWERED 0x0400 /* Card not powerred up. */
#endif
@@ -251,7 +247,7 @@ static char (* DLSTDCALL CT_close) (unsigned short ctn);
#ifdef _WIN32
#include <winioctl.h>
#define SCARD_CTL_CODE(code) CTL_CODE(FILE_DEVICE_SMARTCARD, (code), \
- METHOD_BUFFERED, FILE_ANY_ACCESS)
+ METHOD_BUFFERED, FILE_ANY_ACCESS)
#else
#define SCARD_CTL_CODE(code) (0x42000000 + (code))
#endif
@@ -361,8 +357,7 @@ static int pcsc_vendor_specific_init (int slot);
static int pcsc_get_status (int slot, unsigned int *status);
static int reset_pcsc_reader (int slot);
static int apdu_get_status_internal (int slot, int hang, int no_atr_reset,
- unsigned int *status,
- unsigned int *changed);
+ unsigned int *status);
static int check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo);
static int pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
pininfo_t *pininfo);
@@ -471,8 +466,6 @@ new_reader_slot (void)
reader_table[reader].pinpad_modify = pcsc_pinpad_modify;
reader_table[reader].used = 1;
- reader_table[reader].any_status = 0;
- reader_table[reader].last_status = 0;
reader_table[reader].is_t0 = 1;
reader_table[reader].is_spr532 = 0;
reader_table[reader].pinpad_varlen_supported = 0;
@@ -499,8 +492,7 @@ dump_reader_status (int slot)
if (reader_table[slot].dump_status_reader)
reader_table[slot].dump_status_reader (slot);
- if (reader_table[slot].status != -1
- && reader_table[slot].atrlen)
+ if (reader_table[slot].atrlen)
{
log_info ("slot %d: ATR=", slot);
log_printhex ("", reader_table[slot].atr, reader_table[slot].atrlen);
@@ -590,16 +582,6 @@ ct_error_string (long err)
}
-static void
-ct_dump_reader_status (int slot)
-{
- log_info ("reader slot %d: %s\n", slot,
- reader_table[slot].status == 1? "Processor ICC present" :
- reader_table[slot].status == 0? "Memory ICC present" :
- "ICC not present" );
-}
-
-
/* Wait for the card in SLOT and activate it. Return a status word
error or 0 on success. */
static int
@@ -658,7 +640,6 @@ ct_activate_card (int slot)
return SW_HOST_CARD_IO_ERROR;
}
- reader_table[slot].status = buf[buflen - 1];
memcpy (reader_table[slot].atr, buf, buflen - 2);
reader_table[slot].atrlen = buflen - 2;
return 0;
@@ -763,7 +744,7 @@ open_ct_reader (int port)
reader_table[reader].get_status_reader = ct_get_status;
reader_table[reader].send_apdu_reader = ct_send_apdu;
reader_table[reader].check_pinpad = NULL;
- reader_table[reader].dump_status_reader = ct_dump_reader_status;
+ reader_table[reader].dump_status_reader = NULL;
reader_table[reader].pinpad_verify = NULL;
reader_table[reader].pinpad_modify = NULL;
@@ -984,7 +965,7 @@ pcsc_get_status_direct (int slot, unsigned int *status)
{
*status |= APDU_CARD_PRESENT;
if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
- *status |= APDU_CARD_ACTIVE;
+ *status |= APDU_CARD_ACTIVE;
}
#ifndef HAVE_W32_SYSTEM
/* We indicate a useful card if it is not in use by another
@@ -1553,7 +1534,6 @@ connect_pcsc_card (int slot)
return SW_HOST_ALREADY_CONNECTED;
reader_table[slot].atrlen = 0;
- reader_table[slot].last_status = 0;
reader_table[slot].is_t0 = 0;
err = pcsc_connect (reader_table[slot].pcsc.context,
@@ -1591,11 +1571,6 @@ connect_pcsc_card (int slot)
if (atrlen > DIM (reader_table[0].atr))
log_bug ("ATR returned by pcsc_status is too large\n");
reader_table[slot].atrlen = atrlen;
- /* If we got to here we know that a card is present
- and usable. Remember this. */
- reader_table[slot].last_status = ( APDU_CARD_USABLE
- | APDU_CARD_PRESENT
- | APDU_CARD_ACTIVE);
reader_table[slot].is_t0 = !!(card_protocol & PCSC_PROTOCOL_T0);
}
}
@@ -1955,7 +1930,7 @@ open_pcsc_reader_direct (const char *portstr)
log_error ("error allocating memory for reader list\n");
pcsc_release_context (reader_table[slot].pcsc.context);
reader_table[slot].used = 0;
- unlock_slot (slot);
+ unlock_slot (slot);
return -1 /*SW_HOST_OUT_OF_CORE*/;
}
err = pcsc_list_readers (reader_table[slot].pcsc.context,
@@ -2006,7 +1981,6 @@ open_pcsc_reader_direct (const char *portstr)
reader_table[slot].pcsc.card = 0;
reader_table[slot].atrlen = 0;
- reader_table[slot].last_status = 0;
reader_table[slot].connect_card = connect_pcsc_card;
reader_table[slot].disconnect_card = disconnect_pcsc_card;
@@ -2188,8 +2162,6 @@ open_pcsc_reader_wrapped (const char *portstr)
goto command_failed;
}
- slotp->last_status = 0;
-
/* The open request may return a zero for the ATR length to
indicate that no card is present. */
n = len;
@@ -2201,11 +2173,6 @@ open_pcsc_reader_wrapped (const char *portstr)
i? strerror (errno) : "premature EOF");
goto command_failed;
}
- /* If we got to here we know that a card is present
- and usable. Thus remember this. */
- slotp->last_status = ( APDU_CARD_USABLE
- | APDU_CARD_PRESENT
- | APDU_CARD_ACTIVE);
}
slotp->atrlen = len;
@@ -2353,7 +2320,7 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
if (DBG_CARD_IO)
log_debug ("send secure: c=%02X i=%02X p1=%02X p2=%02X len=%d pinmax=%d\n",
- class, ins, p0, p1, len, pininfo->maxlen);
+ class, ins, p0, p1, len, pininfo->maxlen);
sw = control_pcsc (slot, reader_table[slot].pcsc.verify_ioctl,
pin_verify, len, result, &resultlen);
@@ -2439,7 +2406,7 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
if (DBG_CARD_IO)
log_debug ("send secure: c=%02X i=%02X p1=%02X p2=%02X len=%d pinmax=%d\n",
- class, ins, p0, p1, len, (int)pininfo->maxlen);
+ class, ins, p0, p1, len, (int)pininfo->maxlen);
sw = control_pcsc (slot, reader_table[slot].pcsc.modify_ioctl,
pin_modify, len, result, &resultlen);
@@ -2573,13 +2540,13 @@ check_ccid_pinpad (int slot, int command, pininfo_t *pininfo)
apdu[1] = command;
return ccid_transceive_secure (reader_table[slot].ccid.handle, apdu,
- sizeof apdu, pininfo, NULL, 0, NULL);
+ sizeof apdu, pininfo, NULL, 0, NULL);
}
static int
ccid_pinpad_operation (int slot, int class, int ins, int p0, int p1,
- pininfo_t *pininfo)
+ pininfo_t *pininfo)
{
unsigned char apdu[4];
int err, sw;
@@ -2633,14 +2600,6 @@ open_ccid_reader (const char *portstr)
slotp->atrlen = 0;
err = 0;
}
- else
- {
- /* If we got to here we know that a card is present
- and usable. Thus remember this. */
- reader_table[slot].last_status = (APDU_CARD_USABLE
- | APDU_CARD_PRESENT
- | APDU_CARD_ACTIVE);
- }
reader_table[slot].close_reader = close_ccid_reader;
reader_table[slot].reset_reader = reset_ccid_reader;
@@ -3309,7 +3268,7 @@ apdu_connect (int slot)
Without that we would force a reset of the card with the next
call to apdu_get_status. */
if (!sw)
- sw = apdu_get_status_internal (slot, 1, 1, &status, NULL);
+ sw = apdu_get_status_internal (slot, 1, 1, &status);
if (sw)
;
@@ -3406,19 +3365,9 @@ apdu_reset (int slot)
return sw;
}
- reader_table[slot].last_status = 0;
if (reader_table[slot].reset_reader)
sw = reader_table[slot].reset_reader (slot);
- if (!sw)
- {
- /* If we got to here we know that a card is present
- and usable. Thus remember this. */
- reader_table[slot].last_status = (APDU_CARD_USABLE
- | APDU_CARD_PRESENT
- | APDU_CARD_ACTIVE);
- }
-
unlock_slot (slot);
if (DBG_READER)
log_debug ("leave: apdu_reset => sw=0x%x\n", sw);
@@ -3476,14 +3425,10 @@ apdu_get_atr (int slot, size_t *atrlen)
(bit 3) = card access locked [not yet implemented]
For must applications, testing bit 0 is sufficient.
-
- CHANGED will receive the value of the counter tracking the number
- of card insertions. This value may be used to detect a card
- change.
*/
static int
apdu_get_status_internal (int slot, int hang, int no_atr_reset,
- unsigned int *status, unsigned int *changed)
+ unsigned int *status)
{
int sw;
unsigned int s;
@@ -3501,52 +3446,31 @@ apdu_get_status_internal (int slot, int hang, int no_atr_reset,
if (sw)
{
- reader_table[slot].last_status = 0;
- return sw;
- }
-
- /* Keep track of changes. */
- if (s != reader_table[slot].last_status
- || !reader_table[slot].any_status )
- {
- reader_table[slot].change_counter++;
- /* Make sure that the ATR is invalid so that a reset will be
- triggered by apdu_activate. */
if (!no_atr_reset)
reader_table[slot].atrlen = 0;
+ s = 0;
}
- reader_table[slot].any_status = 1;
- reader_table[slot].last_status = s;
if (status)
*status = s;
- if (changed)
- *changed = reader_table[slot].change_counter;
- return 0;
+ return sw;
}
/* See above for a description. */
int
-apdu_get_status (int slot, int hang,
- unsigned int *status, unsigned int *changed)
+apdu_get_status (int slot, int hang, unsigned int *status)
{
int sw;
if (DBG_READER)
log_debug ("enter: apdu_get_status: slot=%d hang=%d\n", slot, hang);
- sw = apdu_get_status_internal (slot, hang, 0, status, changed);
+ sw = apdu_get_status_internal (slot, hang, 0, status);
if (DBG_READER)
{
- if (status && changed)
- log_debug ("leave: apdu_get_status => sw=0x%x status=%u changecnt=%u\n",
- sw, *status, *changed);
- else if (status)
+ if (status)
log_debug ("leave: apdu_get_status => sw=0x%x status=%u\n",
sw, *status);
- else if (changed)
- log_debug ("leave: apdu_get_status => sw=0x%x changed=%u\n",
- sw, *changed);
else
log_debug ("leave: apdu_get_status => sw=0x%x\n", sw);
}
@@ -3584,7 +3508,7 @@ apdu_check_pinpad (int slot, int command, pininfo_t *pininfo)
int
apdu_pinpad_verify (int slot, int class, int ins, int p0, int p1,
- pininfo_t *pininfo)
+ pininfo_t *pininfo)
{
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
return SW_HOST_NO_DRIVER;
@@ -3597,7 +3521,7 @@ apdu_pinpad_verify (int slot, int class, int ins, int p0, int p1,
return sw;
sw = reader_table[slot].pinpad_verify (slot, class, ins, p0, p1,
- pininfo);
+ pininfo);
unlock_slot (slot);
return sw;
}
@@ -3608,7 +3532,7 @@ apdu_pinpad_verify (int slot, int class, int ins, int p0, int p1,
int
apdu_pinpad_modify (int slot, int class, int ins, int p0, int p1,
- pininfo_t *pininfo)
+ pininfo_t *pininfo)
{
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
return SW_HOST_NO_DRIVER;
diff --git a/scd/apdu.h b/scd/apdu.h
index e29c971..ba856af 100644
--- a/scd/apdu.h
+++ b/scd/apdu.h
@@ -112,8 +112,7 @@ int apdu_disconnect (int slot);
int apdu_set_progress_cb (int slot, gcry_handler_progress_t cb, void *cb_arg);
int apdu_reset (int slot);
-int apdu_get_status (int slot, int hang,
- unsigned int *status, unsigned int *changed);
+int apdu_get_status (int slot, int hang, unsigned int *status);
int apdu_check_pinpad (int slot, int command, pininfo_t *pininfo);
int apdu_pinpad_verify (int slot, int class, int ins, int p0, int p1,
pininfo_t *pininfo);
diff --git a/scd/command.c b/scd/command.c
index 31443c7..02bf76f 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -89,13 +89,7 @@ struct vreader_s
int valid; /* True if the other objects are valid. */
int slot; /* APDU slot number of the reader or -1 if not open. */
- int reset_failed; /* A reset failed. */
-
- int any; /* Flag indicating whether any status check has been
- done. This is set once to indicate that the status
- tracking for the slot has been initialized. */
unsigned int status; /* Last status of the reader. */
- unsigned int changed; /* Last change counter of the reader. */
};
@@ -1707,7 +1701,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
BUG ();
vr = &vreader_table[vrdr];
- if (vr->valid && vr->any && (vr->status & 1))
+ if (vr->valid && (vr->status & 1))
flag = 'u';
}
rc = assuan_send_data (ctx, &flag, 1);
@@ -2248,7 +2242,7 @@ static void
update_reader_status_file (int set_card_removed_flag)
{
int idx;
- unsigned int status, changed;
+ unsigned int status;
/* Note, that we only try to get the status, because it does not
make sense to wait here for a operation to complete. If we are
@@ -2263,13 +2257,11 @@ update_reader_status_file (int set_card_removed_flag)
if (!vr->valid || vr->slot == -1)
continue; /* Not valid or reader not yet open. */
- sw_apdu = apdu_get_status (vr->slot, 0, &status, &changed);
+ sw_apdu = apdu_get_status (vr->slot, 0, &status);
if (sw_apdu == SW_HOST_NO_READER)
{
/* Most likely the _reader_ has been unplugged. */
- apdu_close_reader (vr->slot);
status = 0;
- changed = vr->changed;
}
else if (sw_apdu)
{
@@ -2277,16 +2269,14 @@ update_reader_status_file (int set_card_removed_flag)
continue;
}
- if (!vr->any || vr->status != status || vr->changed != changed )
+ if (vr->status != status)
{
char *fname;
char templ[50];
FILE *fp;
- log_info ("updating reader %d (%d) status: 0x%04X->0x%04X (%u->%u)\n",
- idx, vr->slot, vr->status, status, vr->changed, changed);
- vr->status = status;
- vr->changed = changed;
+ log_info ("updating reader %d (%d) status: 0x%04X->0x%04X\n",
+ idx, vr->slot, vr->status, status);
/* FIXME: Should this be IDX instead of vr->slot? This
depends on how client sessions will associate the reader
@@ -2346,10 +2336,10 @@ update_reader_status_file (int set_card_removed_flag)
}
/* Set the card removed flag for all current sessions. */
- if (vr->any && vr->status == 0 && set_card_removed_flag)
+ if (status == 0 && set_card_removed_flag)
update_card_removed (idx, 1);
- vr->any = 1;
+ vr->status = status;
/* Send a signal to all clients who applied for it. */
send_client_notifications ();
-----------------------------------------------------------------------
Summary of changes:
scd/apdu.c | 118 +++++++++++-----------------------------------------------
scd/apdu.h | 3 +-
scd/command.c | 26 ++++---------
3 files changed, 30 insertions(+), 117 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list