Remove code supporting OS X Tiger

smartcard/Examples/scard-api/sample_control.py

@@ -72,8 +72,7 @@
  for i in xrange(len(response)):
  r += "%c" % response[i]
  print 'SCARD_ATTR_VENDOR_NAME:', r
- elif 'pcsclite' == resourceManager and \
- not 'pcsclite-tiger' == resourceManagerSubType:
+ elif 'pcsclite' == resourceManager:
  # get firmware on Gemplus readers
  hresult, response = SCardControl(
  hcard,

smartcard/Examples/scard-api/sample_getAttrib.py

@@ -32,58 +32,57 @@
 from smartcard.scard import *
 import smartcard.util
 
-if 'pcsclite-tiger' == resourceManagerSubType:
- attributes = {}
-else:
- attributes = {
- SCARD_ATTR_ATR_STRING: 'SCARD_ATTR_ATR_STRING',
- SCARD_ATTR_CHANNEL_ID: 'SCARD_ATTR_CHANNEL_ID',
- SCARD_ATTR_CHARACTERISTICS: 'SCARD_ATTR_CHARACTERISTICS',
- SCARD_ATTR_CURRENT_BWT: 'SCARD_ATTR_CURRENT_BWT',
- SCARD_ATTR_CURRENT_CLK: 'SCARD_ATTR_CURRENT_CLK',
- SCARD_ATTR_CURRENT_CWT: 'SCARD_ATTR_CURRENT_CWT',
- SCARD_ATTR_CURRENT_D: 'SCARD_ATTR_CURRENT_D',
- SCARD_ATTR_CURRENT_EBC_ENCODING: 'SCARD_ATTR_CURRENT_EBC_ENCODING',
- SCARD_ATTR_CURRENT_F: 'SCARD_ATTR_CURRENT_F',
- SCARD_ATTR_CURRENT_IFSC: 'SCARD_ATTR_CURRENT_IFSC',
- SCARD_ATTR_CURRENT_IFSD: 'SCARD_ATTR_CURRENT_IFSD',
- SCARD_ATTR_CURRENT_IO_STATE: 'SCARD_ATTR_CURRENT_IO_STATE',
- SCARD_ATTR_CURRENT_N: 'SCARD_ATTR_CURRENT_N',
- SCARD_ATTR_CURRENT_PROTOCOL_TYPE: 'SCARD_ATTR_CURRENT_PROTOCOL_TYPE',
- SCARD_ATTR_CURRENT_W: 'SCARD_ATTR_CURRENT_W',
- SCARD_ATTR_DEFAULT_CLK: 'SCARD_ATTR_DEFAULT_CLK',
- SCARD_ATTR_DEFAULT_DATA_RATE: 'SCARD_ATTR_DEFAULT_DATA_RATE',
- SCARD_ATTR_DEVICE_FRIENDLY_NAME_A: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_A',
- SCARD_ATTR_DEVICE_FRIENDLY_NAME_W: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_W',
- SCARD_ATTR_DEVICE_IN_USE: 'SCARD_ATTR_DEVICE_IN_USE',
- SCARD_ATTR_DEVICE_SYSTEM_NAME_A: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_A',
- SCARD_ATTR_DEVICE_SYSTEM_NAME_W: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_W',
- SCARD_ATTR_DEVICE_UNIT: 'SCARD_ATTR_DEVICE_UNIT',
- SCARD_ATTR_ESC_AUTHREQUEST: 'SCARD_ATTR_ESC_AUTHREQUEST',
- SCARD_ATTR_ESC_CANCEL: 'SCARD_ATTR_ESC_CANCEL',
- SCARD_ATTR_ESC_RESET: 'SCARD_ATTR_ESC_RESET',
- SCARD_ATTR_EXTENDED_BWT: 'SCARD_ATTR_EXTENDED_BWT',
- SCARD_ATTR_ICC_INTERFACE_STATUS: 'SCARD_ATTR_ICC_INTERFACE_STATUS',
- SCARD_ATTR_ICC_PRESENCE: 'SCARD_ATTR_ICC_PRESENCE',
- SCARD_ATTR_ICC_TYPE_PER_ATR: 'SCARD_ATTR_ICC_TYPE_PER_ATR',
- SCARD_ATTR_MAXINPUT: 'SCARD_ATTR_MAXINPUT',
- SCARD_ATTR_MAX_CLK: 'SCARD_ATTR_MAX_CLK',
- SCARD_ATTR_MAX_DATA_RATE: 'SCARD_ATTR_MAX_DATA_RATE',
- SCARD_ATTR_MAX_IFSD: 'SCARD_ATTR_MAX_IFSD',
- SCARD_ATTR_POWER_MGMT_SUPPORT: 'SCARD_ATTR_POWER_MGMT_SUPPORT',
- SCARD_ATTR_SUPRESS_T1_IFS_REQUEST: 'SCARD_ATTR_SUPRESS_T1_IFS_REQUEST',
- SCARD_ATTR_USER_AUTH_INPUT_DEVICE: 'SCARD_ATTR_USER_AUTH_INPUT_DEVICE',
- SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE: \
- 'SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE',
- SCARD_ATTR_VENDOR_IFD_SERIAL_NO: 'SCARD_ATTR_VENDOR_IFD_SERIAL_NO',
- SCARD_ATTR_VENDOR_IFD_TYPE: 'SCARD_ATTR_VENDOR_IFD_TYPE',
- SCARD_ATTR_VENDOR_IFD_VERSION: 'SCARD_ATTR_VENDOR_IFD_VERSION',
- SCARD_ATTR_VENDOR_NAME: 'SCARD_ATTR_VENDOR_NAME'}
- if 'pcsclite' == resourceManager:
- extra_attributes = {
- SCARD_ATTR_ASYNC_PROTOCOL_TYPES: 'SCARD_ATTR_ASYNC_PROTOCOL_TYPES',
- SCARD_ATTR_SYNC_PROTOCOL_TYPES: 'SCARD_ATTR_SYNC_PROTOCOL_TYPES'}
- attributes.update(extra_attributes)
+attributes = {
+ SCARD_ATTR_ATR_STRING: 'SCARD_ATTR_ATR_STRING',
+ SCARD_ATTR_CHANNEL_ID: 'SCARD_ATTR_CHANNEL_ID',
+ SCARD_ATTR_CHARACTERISTICS: 'SCARD_ATTR_CHARACTERISTICS',
+ SCARD_ATTR_CURRENT_BWT: 'SCARD_ATTR_CURRENT_BWT',
+ SCARD_ATTR_CURRENT_CLK: 'SCARD_ATTR_CURRENT_CLK',
+ SCARD_ATTR_CURRENT_CWT: 'SCARD_ATTR_CURRENT_CWT',
+ SCARD_ATTR_CURRENT_D: 'SCARD_ATTR_CURRENT_D',
+ SCARD_ATTR_CURRENT_EBC_ENCODING: 'SCARD_ATTR_CURRENT_EBC_ENCODING',
+ SCARD_ATTR_CURRENT_F: 'SCARD_ATTR_CURRENT_F',
+ SCARD_ATTR_CURRENT_IFSC: 'SCARD_ATTR_CURRENT_IFSC',
+ SCARD_ATTR_CURRENT_IFSD: 'SCARD_ATTR_CURRENT_IFSD',
+ SCARD_ATTR_CURRENT_IO_STATE: 'SCARD_ATTR_CURRENT_IO_STATE',
+ SCARD_ATTR_CURRENT_N: 'SCARD_ATTR_CURRENT_N',
+ SCARD_ATTR_CURRENT_PROTOCOL_TYPE: 'SCARD_ATTR_CURRENT_PROTOCOL_TYPE',
+ SCARD_ATTR_CURRENT_W: 'SCARD_ATTR_CURRENT_W',
+ SCARD_ATTR_DEFAULT_CLK: 'SCARD_ATTR_DEFAULT_CLK',
+ SCARD_ATTR_DEFAULT_DATA_RATE: 'SCARD_ATTR_DEFAULT_DATA_RATE',
+ SCARD_ATTR_DEVICE_FRIENDLY_NAME_A: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_A',
+ SCARD_ATTR_DEVICE_FRIENDLY_NAME_W: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_W',
+ SCARD_ATTR_DEVICE_IN_USE: 'SCARD_ATTR_DEVICE_IN_USE',
+ SCARD_ATTR_DEVICE_SYSTEM_NAME_A: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_A',
+ SCARD_ATTR_DEVICE_SYSTEM_NAME_W: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_W',
+ SCARD_ATTR_DEVICE_UNIT: 'SCARD_ATTR_DEVICE_UNIT',
+ SCARD_ATTR_ESC_AUTHREQUEST: 'SCARD_ATTR_ESC_AUTHREQUEST',
+ SCARD_ATTR_ESC_CANCEL: 'SCARD_ATTR_ESC_CANCEL',
+ SCARD_ATTR_ESC_RESET: 'SCARD_ATTR_ESC_RESET',
+ SCARD_ATTR_EXTENDED_BWT: 'SCARD_ATTR_EXTENDED_BWT',
+ SCARD_ATTR_ICC_INTERFACE_STATUS: 'SCARD_ATTR_ICC_INTERFACE_STATUS',
+ SCARD_ATTR_ICC_PRESENCE: 'SCARD_ATTR_ICC_PRESENCE',
+ SCARD_ATTR_ICC_TYPE_PER_ATR: 'SCARD_ATTR_ICC_TYPE_PER_ATR',
+ SCARD_ATTR_MAXINPUT: 'SCARD_ATTR_MAXINPUT',
+ SCARD_ATTR_MAX_CLK: 'SCARD_ATTR_MAX_CLK',
+ SCARD_ATTR_MAX_DATA_RATE: 'SCARD_ATTR_MAX_DATA_RATE',
+ SCARD_ATTR_MAX_IFSD: 'SCARD_ATTR_MAX_IFSD',
+ SCARD_ATTR_POWER_MGMT_SUPPORT: 'SCARD_ATTR_POWER_MGMT_SUPPORT',
+ SCARD_ATTR_SUPRESS_T1_IFS_REQUEST: 'SCARD_ATTR_SUPRESS_T1_IFS_REQUEST',
+ SCARD_ATTR_USER_AUTH_INPUT_DEVICE: 'SCARD_ATTR_USER_AUTH_INPUT_DEVICE',
+ SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE:
+ 'SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE',
+ SCARD_ATTR_VENDOR_IFD_SERIAL_NO: 'SCARD_ATTR_VENDOR_IFD_SERIAL_NO',
+ SCARD_ATTR_VENDOR_IFD_TYPE: 'SCARD_ATTR_VENDOR_IFD_TYPE',
+ SCARD_ATTR_VENDOR_IFD_VERSION: 'SCARD_ATTR_VENDOR_IFD_VERSION',
+ SCARD_ATTR_VENDOR_NAME: 'SCARD_ATTR_VENDOR_NAME',
+ }
+if 'pcsclite' == resourceManager:
+ extra_attributes = {
+ SCARD_ATTR_ASYNC_PROTOCOL_TYPES: 'SCARD_ATTR_ASYNC_PROTOCOL_TYPES',
+ SCARD_ATTR_SYNC_PROTOCOL_TYPES: 'SCARD_ATTR_SYNC_PROTOCOL_TYPES',
+ }
+ attributes.update(extra_attributes)
 
 
 def printAttribute(attrib, value):

smartcard/scard/PcscDefs.i

@@ -348,10 +348,5 @@ typedef enum
 %constant unsigned long SCARD_P_SHUTDOWN = 0x80100018 ;
 
 // Infinite timeout
-// on Mac OS X Tiger, a 0xffffffff infinite time-out causes a random crash upon SCardGetStatusChange return
-#ifdef __TIGER__
-%constant unsigned long INFINITE = 4320000 ;
-#else // !__TIGER__
 %constant unsigned long INFINITE = 0x7FFFFFFF ;
-#endif // __TIGER__
 

smartcard/scard/scard.i

@@ -106,24 +106,6 @@ provides mapping for the following API functions:
  - SCardStatus
  - SCardTransmit
 
-On Mac OS X Tiger with PCSC lite, the smartcard.scard module provides
-mapping for the following API functions:
-
- - SCardBeginTransaction
- - SCardCancel
- - SCardConnect
- - SCardControl
- - SCardDisconnect
- - SCardEndTransaction
- - SCardEstablishContext
- - SCardGetStatusChange
- - SCardListReaders
- - SCardListReaderGroups
- - SCardReconnect
- - SCardReleaseContext
- - SCardStatus
- - SCardTransmit
-
 The following PCSC smart card functions are not wrapped by the scard
 module on any platform:
 
@@ -371,10 +353,6 @@ SCARDRETCODE _RemoveReaderFromGroup(
 #endif // WIN32
 
 
-//
-// These functions are not available on Max OS X Tiger
-//
-#ifndef __TIGER__
 ///////////////////////////////////////////////////////////////////////////////
 static SCARDRETCODE _IsValidContext(SCARDCONTEXT hcontext)
 {
@@ -413,35 +391,9 @@ static SCARDRETCODE _SetAttrib(SCARDHANDLE hcard, SCARDDWORDARG dwAttrId, BYTELI
  lRetCode = (mySCardSetAttrib)(hcard, dwAttrId, pbl->ab, pbl->cBytes);
  return lRetCode;
 }
-#endif // !__TIGER__
 
 
-//
-// SCardControl does not have the same prototype on Mac OS X Tiger
-//
 
-#ifdef __TIGER__
- ///////////////////////////////////////////////////////////////////////////////
- static SCARDRETCODE _Control(
- SCARDHANDLE hcard,
- BYTELIST* pblSendBuffer,
- BYTELIST* pblRecvBuffer
- )
- {
- SCARDRETCODE lRet;
-
- pblRecvBuffer->ab = (unsigned char*)mem_Malloc(MAX_BUFFER_SIZE_EXTENDED*sizeof(unsigned char));
- pblRecvBuffer->cBytes = MAX_BUFFER_SIZE_EXTENDED;
-
- lRet = (mySCardControl)(
- hcard,
- pblSendBuffer->ab,
- pblSendBuffer->cBytes,
- pblRecvBuffer->ab,
- &pblRecvBuffer->cBytes);
- return lRet;
- }
-#else // !__TIGER__
  ///////////////////////////////////////////////////////////////////////////////
  static SCARDRETCODE _Control(
  SCARDHANDLE hcard,
@@ -465,7 +417,6 @@ static SCARDRETCODE _SetAttrib(SCARDHANDLE hcard, SCARDDWORDARG dwAttrId, BYTELI
  &pblRecvBuffer->cBytes);
  return lRet;
  }
-#endif // __TIGER__
 
 ///////////////////////////////////////////////////////////////////////////////
 static SCARDRETCODE _BeginTransaction(SCARDHANDLE hcard)
@@ -519,20 +470,6 @@ static SCARDRETCODE _EstablishContext(SCARDDWORDARG dwScope, SCARDCONTEXT* phCon
 {
  long lRet;
  lRet = (mySCardEstablishContext)(dwScope, NULL, NULL, phContext);
-
- #ifdef __TIGER__
- // SCardReleaseContext on Mac OS X Tiger fails if SCardConnect is not called with an established
- // context, even on a dummy reader
- if (SCARD_S_SUCCESS==lRet)
- {
- SCARDHANDLE hcard;
- SCARDDWORDARG dwarg;
- (mySCardConnectA)(*phContext, "dummy-reader", SCARD_SHARE_SHARED,
- SCARD_PROTOCOL_ANY, &hcard, &dwarg);
- }
- #endif // __TIGER__
-
- return lRet;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1248,13 +1185,6 @@ SCARDRETCODE _RemoveReaderFromGroup(
 
 #endif // WIN32
 
-
-//
-// These functions are not available on Max OS X Tiger
-//
-//
-#ifndef __TIGER__
-
  ///////////////////////////////////////////////////////////////////////////////
  %define DOCSTRING_ISVALIDCONTEXT
  "
@@ -1508,41 +1438,7 @@ SCARDRETCODE _RemoveReaderFromGroup(
  %rename(SCardSetAttrib) _SetAttrib(SCARDHANDLE hcard, SCARDDWORDARG dwAttrId, BYTELIST* ATTRIBUTESIN);
  SCARDRETCODE _SetAttrib(SCARDHANDLE hcard, SCARDDWORDARG dwAttrId, BYTELIST* ATTRIBUTESIN);
 
-#endif // !__TIGER__
-
-
-//
-// SCardControl does not have the same prototype on Mac OS X Tiger
-//
-#ifdef __TIGER__
- ///////////////////////////////////////////////////////////////////////////////
- %define DOCSTRING_CONTROL
- "
- This function sends a control command to the reader connected to by
- SCardConnect(). It returns a result and the control response.
 
- from smartcard.scard import *
- hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
- hresult, hcard, dwActiveProtocol = SCardConnect(
- hcontext, 'SchlumbergerSema Reflex USB v.2 0', SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0)
- CMD = [ 42, 0x12, 0x34]
- hresult, response = SCardControl(hcard, CMD)
- if hresult != SCARD_S_SUCCESS:
- raise error, 'Failed to control: ' + SCardGetErrorMessage(hresult)
- "
- %enddef
- %feature("docstring") DOCSTRING_CONTROL;
- %rename(SCardControl) _Control(
- SCARDHANDLE hcard,
- BYTELIST* INBUFFER,
- BYTELIST* OUTBUFFER
- );
- SCARDRETCODE _Control(
- SCARDHANDLE hcard,
- BYTELIST* INBUFFER,
- BYTELIST* OUTBUFFER
- );
-#else // !__TIGER__
  ///////////////////////////////////////////////////////////////////////////////
  %define DOCSTRING_CONTROL
  "
@@ -1573,7 +1469,6 @@ SCARDRETCODE _RemoveReaderFromGroup(
  BYTELIST* INBUFFER,
  BYTELIST* OUTBUFFER
  );
-#endif // __TIGER__
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2080,9 +1975,6 @@ def SCardLocateCards(hcontext, cardnames, readerstates):
 #ifdef PCSCLITE
 %constant char* resourceManager = "pcsclite" ;
  #ifdef __APPLE__
- #ifdef __TIGER__
- %constant char* resourceManagerSubType = "pcsclite-tiger" ;
- #endif //__TIGER__
  #ifdef __LEOPARD__
  %constant char* resourceManagerSubType = "pcsclite-leopard" ;
  #endif //__LEOPARD__

smartcard/scard/winscarddll.c

@@ -228,10 +228,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  SCARDSTATE mySCardState = _defaultSCARDSTATE;
 #endif // WIN32
 
-//
-// These functions are not available on Max OS X Tiger
-//
-#ifndef __TIGER__
  static WINSCARDAPI SCARDRETCODE
  WINAPI _defaultSCARDISVALIDCONTEXT(
  IN SCARDCONTEXT hContext)
@@ -275,23 +271,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  SCARDGETATTRIB mySCardGetAttrib = _defaultSCARDGETATTRIB;
  SCARDSETATTRIB mySCardSetAttrib = _defaultSCARDSETATTRIB;
 
-#endif // !__TIGER__
-
-//
-// SCardControl does not have the same prototype on Mac OS X Tiger
-//
-#ifdef __TIGER__
- static WINSCARDAPI SCARDRETCODE
- WINAPI _defaultSCARDCONTROL(
- IN SCARDHANDLE hCard,
- IN const unsigned char* lpInBuffer,
- IN SCARDDWORDARG nInBufferSize,
- OUT unsigned char* lpOutBuffer,
- IN OUT SCARDDWORDARG* lpBytesReturned)
- {
- return SCARD_E_NO_SERVICE;
- }
-#else // !__TIGER__
  static WINSCARDAPI SCARDRETCODE
  WINAPI _defaultSCARDCONTROL(
  IN SCARDHANDLE hCard,
@@ -312,7 +291,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
  return SCARD_E_NO_SERVICE;
  }
-#endif // __TIGER__
 
 #ifdef PCSCLITE
 ///////////////////////////////////////////////////////////////////////////////
@@ -774,18 +752,12 @@ long winscard_init(void)
  #ifndef __APPLE__
  GETPROCADDRESS( SCARDCONTROL, SCardControl, SCardControl );
  #else // !__APPLE__
- #ifdef __TIGER__
- GETPROCADDRESS( SCARDCONTROL, SCardControl, SCardControl );
- #else // ! __TIGER__
- GETPROCADDRESS( SCARDCONTROL, SCardControl, SCardControl132 );
- #endif // __TIGER__
+ GETPROCADDRESS( SCARDCONTROL, SCardControl, SCardControl132 );
  #endif // __APPLE__
 
- #ifndef __TIGER__
  SILENTGETPROCADDRESS( SCARDISVALIDCONTEXT , SCardIsValidContext , SCardIsValidContext );
  GETPROCADDRESS( SCARDGETATTRIB , SCardGetAttrib , SCardGetAttrib );
  GETPROCADDRESS( SCARDSETATTRIB , SCardSetAttrib , SCardSetAttrib );
- #endif
 
  myg_prgSCardT0Pci = dlsym( handle, "g_rgSCardT0Pci" );
  myg_prgSCardT1Pci = dlsym( handle, "g_rgSCardT1Pci" );