commit 158c1dd448958d3e2f9079094d9cf852e67cd37c
author Christina Quast <chrysh.ng+git@gmail.com> Fri Apr 17 20:19:29 2015 +0200
committer Christina Quast <chrysh.ng+git@gmail.com> Fri Apr 17 20:34:09 2015 +0200
tree 612154cf3dd228b1cc4a75a70c9cca8e28f97015
parent 4b8149363a74ab4480e1cfd7b2e3249b0049ac87

simtrace.py: Use mitm.py in phone and mitm mode

usb_application/simtrace.py

diff --git a/usb_application/simtrace.py b/usb_application/simtrace.py
index 1cb9c7c..4b8f3c7 100755
--- a/usb_application/simtrace.py
+++ b/usb_application/simtrace.py
@@ -4,16 +4,11 @@
 import sniffer
 import ccid
 import ccid_select
-import phone
 import mitm
 
 import usb.core
 import usb.util
-
-import hashlib
-import os
-import random
-import re
+import sys
 import time
 
 cmd1 = {0x00, 0x10, 0x00, 0x00}
@@ -91,9 +86,9 @@
     if args.select_file is True:
         ccid_select.select()
     if args.phone is True:
-        phone.emulate_sim()
+        mitm.do_mitm(sim_emul=True)
     if args.mitm is True:
-        mitm.do_mitm()
+        mitm.do_mitm(sim_emul=False)
 
     return