Commit Graph

17 Commits

Author SHA1 Message Date
Christina Quast
b06fc38939 usb.c: fix compiler warning USBConfigurationDescriptor 2015-04-06 23:30:21 +02:00
Christina Quast
4b1e98d058 cciddriver.c: Directly access configurationDescriptorsArr 2015-04-06 23:28:41 +02:00
Christina Quast
e01fb9a146 usb.c: mitm config with ccid interface 2015-04-04 19:56:23 +02:00
Christina Quast
0becc0c51c Fixed compiler warn: USB descriptor array elements
The compiler warning:

simtrace/usb.c:553:5: warning: initialization from incompatible pointer type [enabled by default]
     &configurationDescriptorSniffer,
     ^
simtrace/usb.c:553:5: warning: (near initialization for 'configurationDescriptorsArr[0]') [enabled by default]
simtrace/usb.c:554:5: warning: initialization from incompatible pointer type [enabled by default]
     &configurationDescriptorCCID,
     ^
simtrace/usb.c:554:5: warning: (near initialization for 'configurationDescriptorsArr[1]') [enabled by default]
simtrace/usb.c:555:5: warning: initialization from incompatible pointer type [enabled by default]
     &configurationDescriptorPhone,
     ^
simtrace/usb.c:555:5: warning: (near initialization for 'configurationDescriptorsArr[2]') [enabled by default]
simtrace/usb.c:556:5: warning: initialization from incompatible pointer type [enabled by default]
     &configurationDescriptorMITM,
     ^
simtrace/usb.c:556:5: warning: (near initialization for 'configurationDescriptorsArr[3]') [enabled by default]
simtrace/usb.c: In function 'getConfigDesc':
simtrace/usb.c:560:5: warning: return discards 'const' qualifier from pointer target type [enabled by default]
     return configurationDescriptorsArr[idx];
     ^
simtrace/usb.c: At top level:
2015-04-04 13:04:06 +02:00
Christina Quast
b65b881de1 Phone uses USB endpoints 4 to 6 instead of 1 to 3 now 2015-04-04 10:51:37 +02:00
Christina Quast
6d9dcfc41d usb.c: updated phone descriptor length 2015-04-03 22:26:43 +02:00
Christina Quast
99d80ffb87 usb.c: Updated comment to be generic 2015-04-03 22:26:07 +02:00
Christina Quast
7123425841 redifined phone usb interface 2015-04-03 11:35:59 +02:00
Christina Quast
0166c6d64e Temporary fix: mitm mode use EP 4-6 2015-03-05 15:44:05 +01:00
Christina Quast
db7b1abd17 CCID config, init, run
Switching to config 1 and 2 works, but to 3 and 4 usb_enum.py is
hanging for some reason. Switching the USB config from Sniffer to
CCID reader was not tested yet.
2015-03-03 12:34:54 +01:00
Christina Quast
4ba4d2230b sniffer functionality fixed buffer
It is possible to use sniffer.py to sniff the phone-simcard-communication.

To be fixed: The buffer size read is fixed and the data is only send
over USB if the buffer max length is reached. which means we don not
get the last bytes of the transaction.
This should be changed in one of the next commits. Maybe the former
simtrace code can give some inspiration on this topic.
2015-03-02 16:14:09 +01:00
Christina Quast
da373fde1b Add input interrupt endpoint to all configurations 2015-02-27 15:26:26 +01:00
Christina Quast
6032e796b9 string descr 0 is language identifier 2015-02-27 15:22:25 +01:00
Christina Quast
0ae0314f6b Add usb config changed callback func 2015-02-25 18:43:46 +01:00
Christina Quast
10b2e5accc Consistent config num enum for main.c and usb.c 2015-02-25 18:40:15 +01:00
Christina Quast
54d0c1fca8 USB enum works again, No CCID conf 2015-02-25 16:04:25 +01:00
Christina Quast
968b974cbe Moved usb descriptors and funcs into single file 2015-02-25 14:10:12 +01:00