catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-19 06:48:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

array to hex function, reduced usb timeout

Browse Source
This commit is contained in:
Christina Quast
2015-04-11 08:42:38 +02:00
parent 95d6616ba1
commit f2e53f0553
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
usb_application/mitm.py
View File

@@ -6,6 +6,7 @@ import phone
from contextlib import closing
from util import HEX
def find_dev():
dev = usb.core.find(idVendor=0x03eb, idProduct=0x6004)
@@ -36,14 +37,15 @@ ERR_TIMEOUT = 110
def poll_ep(dev, ep):
try:
return dev.read(ep, 64, 1000)
return dev.read(ep, 64, 100)
except usb.core.USBError as e:
if e.errno != ERR_TIMEOUT:
raise
return None
def write_phone(dev, resp):
dev.write(PHONE_WR, resp, 1000)
print("WR: ", HEX(resp))
dev.write(PHONE_WR, resp, 100)
def do_mitm():
dev = find_dev()
@@ -52,14 +54,15 @@ def do_mitm():
while True:
cmd = poll_ep(dev, PHONE_INT)
if cmd is not None:
print(cmd)
print("Int line ", HEX(cmd))
assert cmd[0] == ord('R')
# FIXME: restart card anyways?
# sm_con.reset_card()
print("Write atr: ", HEX(atr))
write_phone(dev, atr)
cmd = poll_ep(dev, PHONE_RD)
if cmd is not None:
print(cmd)
print("RD: ", HEX(cmd))
sim_data = sm_con.send_receive_cmd(cmd)
write_phone(dev, sim_data)