From 425717d08bbfd600fcb411a668f36e308207c719 Mon Sep 17 00:00:00 2001 From: Christina Quast Date: Thu, 14 May 2015 17:20:55 +0200 Subject: mitm,sniffer.py: Send APDUs to wireshark --- usb_application/mitm.py | 2 ++ usb_application/sniffer.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/usb_application/mitm.py b/usb_application/mitm.py index 4736d6c..a3951f0 100755 --- a/usb_application/mitm.py +++ b/usb_application/mitm.py @@ -4,6 +4,7 @@ import array from ccid_raw import SmartcardConnection from smartcard_emulator import SmartCardEmulator +from gsmtap import gsmtap_send_apdu from contextlib import closing @@ -93,6 +94,7 @@ def do_mitm(sim_emul=True): for c in cmd: if apdu.state == apdu_states.APDU_S_FIN: apdus.append(apdu) + gsmtap_send_apdu(apdu.buf) apdu = Apdu_splitter() apdu.split(c) diff --git a/usb_application/sniffer.py b/usb_application/sniffer.py index cbf3ad1..7ac2dae 100755 --- a/usb_application/sniffer.py +++ b/usb_application/sniffer.py @@ -6,6 +6,7 @@ import sys import array from apdu_split import Apdu_splitter, apdu_states +from gsmtap import gsmtap_send_apdu from constants import PHONE_RD, ERR_TIMEOUT, ERR_NO_SUCH_DEV @@ -73,5 +74,6 @@ def sniff(): apdu.split(c) if apdu.state == apdu_states.APDU_S_FIN: apdus.append(apdu) + gsmtap_send_apdu(apdu.buf) apdu = Apdu_splitter() ans = array.array('B', []) -- cgit v1.2.3