aboutsummaryrefslogtreecommitdiffstats
path: root/pySim/transport/pcsc.py
diff options
context:
space:
mode:
Diffstat (limited to 'pySim/transport/pcsc.py')
-rw-r--r--pySim/transport/pcsc.py40
1 files changed, 3 insertions, 37 deletions
diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py
index c7be4a0..a242976 100644
--- a/pySim/transport/pcsc.py
+++ b/pySim/transport/pcsc.py
@@ -27,10 +27,11 @@ from smartcard.System import readers
from smartcard.CardConnectionObserver import ConsoleCardConnectionObserver
from pySim.exceptions import NoCardError
+from pySim.transport import LinkBase
from pySim.utils import h2i, i2h
-class PcscSimLink(object):
+class PcscSimLink(LinkBase):
def __init__(self, reader_number=0, observer=0):
r = readers();
@@ -57,13 +58,8 @@ class PcscSimLink(object):
return 1
def send_apdu_raw(self, pdu):
- """send_apdu_raw(pdu): Sends an APDU with minimal processing
+ """see LinkBase.send_apdu_raw"""
- pdu : string of hexadecimal characters (ex. "A0A40000023F00")
- return : tuple(data, sw), where
- data : string (in hex) of returned data (ex. "074F4EFFFF")
- sw : string (in hex) of status word (ex. "9000")
- """
apdu = h2i(pdu)
data, sw1, sw2 = self._con.transmit(apdu)
@@ -72,33 +68,3 @@ class PcscSimLink(object):
# Return value
return i2h(data), i2h(sw)
-
- def send_apdu(self, pdu):
- """send_apdu(pdu): Sends an APDU and auto fetch response data
-
- pdu : string of hexadecimal characters (ex. "A0A40000023F00")
- return : tuple(data, sw), where
- data : string (in hex) of returned data (ex. "074F4EFFFF")
- sw : string (in hex) of status word (ex. "9000")
- """
- data, sw = self.send_apdu_raw(pdu)
-
- if (sw is not None) and (sw[0:2] == '9f'):
- pdu_gr = pdu[0:2] + 'c00000' + sw[2:4]
- data, sw = self.send_apdu_raw(pdu_gr)
-
- return data, sw
-
- def send_apdu_checksw(self, pdu, sw="9000"):
- """send_apdu_checksw(pdu,sw): Sends an APDU and check returned SW
-
- pdu : string of hexadecimal characters (ex. "A0A40000023F00")
- sw : string of 4 hexadecimal characters (ex. "9000")
- return : tuple(data, sw), where
- data : string (in hex) of returned data (ex. "074F4EFFFF")
- sw : string (in hex) of status word (ex. "9000")
- """
- rv = self.send_apdu(pdu)
- if sw.lower() != rv[1]:
- raise RuntimeError("SW match failed ! Expected %s and got %s." % (sw.lower(), rv[1]))
- return rv