Christina Quast
68cc859870
iso7816_4.c: Moved around lines, only sniffer works
2015-04-16 11:08:32 +02:00
Christina Quast
ec9c09e9b9
Moved global Usart state into usart struct
2015-04-16 10:45:39 +02:00
Christina Quast
f3211e6424
board.h: init more phone pins (as input)
2015-04-16 10:41:12 +02:00
Christina Quast
9547e9f149
sniffer.py: Added apdu_split support
2015-04-14 22:18:30 +02:00
Christina Quast
51925a6bec
apdu_split.py: Corrected last error
2015-04-14 21:04:14 +02:00
Christina Quast
d4c8b51e86
apdu_split working with test message
2015-04-14 15:53:13 +02:00
Christina Quast
e64aa5b878
apdu_split without C code remains
2015-04-14 15:07:33 +02:00
Christina Quast
79c2a3a0c8
apdu_split: first try
2015-04-14 14:55:13 +02:00
Christina Quast
2571458595
sniffer.py: Write out every received char
2015-04-13 22:40:40 +02:00
Christina Quast
911bf26a55
sniffer.c: Enable/disable interrupts in init/exit function
2015-04-13 22:39:11 +02:00
Christina Quast
d52201f6db
phone.c: Enable/disable interrupts on init/exit
2015-04-13 22:38:05 +02:00
Christina Quast
dcce4c3244
phone.c: Callback routine for reenabling RST interrupt
2015-04-13 22:20:12 +02:00
Christina Quast
c63da3f6d5
Makefile: Check for already opened ttyUSBx
...
If two ttyUSBx interfaces are read from by ts at the same time,
some letters arrive at one terminal and others in the second one.
Therefore only one terminal should be open at all times.
2015-04-13 22:09:50 +02:00
Christina Quast
de68867402
main.c: Reset board if USB not configured
2015-04-12 15:20:57 +02:00
Christina Quast
fd069dce73
iso7816_4.c: Increased max interations
2015-04-12 13:32:12 +02:00
Christina Quast
b595e7cb53
Merge branch 'new_iso_init' (sniffer not working)
...
Conflicts:
firmware/src_simtrace/phone.c
firmware/src_simtrace/simtrace.h
2015-04-12 13:31:01 +02:00
Christina Quast
2b8a18bf3a
Sniffer with ringbuf, works SOMETIMES
...
* Sniffer uses phone endpoints for communication and the ringbuffer
routines the phone communication uses
* Most times the Usart1 interrupt is not triggered, and therefore
no values are recorded
2015-04-12 09:31:36 +02:00
Christina Quast
5c6a299c71
phone.c: Sniffer bus config make switch
2015-04-11 20:03:14 +02:00
Christina Quast
3a47a4f10e
mitm.py: Decreased timeout
2015-04-11 18:16:14 +02:00
Christina Quast
611bea8b4b
tc_etu: Corrected compiler warning
2015-04-11 18:15:51 +02:00
Christina Quast
4db82e092f
ringbuffer implementation
2015-04-11 18:15:27 +02:00
Christina Quast
94ddb91e33
mitm.py: New smartcard ATR, expanded pattern match
2015-04-11 12:29:41 +02:00
Christina Quast
2ee3ec73f4
tc_etu.c: Fixed PIN initialisation compiler waring
2015-04-11 12:27:46 +02:00
Christina Quast
542f9183bb
basic ringbuffer implementation
2015-04-11 09:31:15 +02:00
Christina Quast
87ddfa8c23
phone.c: Bug fix: USB err format string interchanged
2015-04-11 08:44:40 +02:00
Christina Quast
a0ca2d34ec
cciddriver.c: Remove ccid write printout
2015-04-11 08:43:31 +02:00
Christina Quast
f2e53f0553
array to hex function, reduced usb timeout
2015-04-11 08:42:38 +02:00
Christina Quast
e24b9ace89
ISO7816_Init: Initialized with USART
...
* ISO7816_Init: Takes Usart_info and CLK_SLAVE/CLK_MASTER as param
* ISO7816_SendChar, ISO7816_GetChar: Usart_info is passed
* ISO7816_Set_Reset_Pin function for CCID part
* iso7816_4.c: BOARD_ISO7816_BASE_USART replaced by USART_SIM
* Redundant _ISO7816_Init, _ISO7816_SendChar, _ISO7816_GetChar
functions removed
* All simtrace modes use iso7816_4.c functions instead of redefined
_ISO7816_xxx functions
2015-04-10 17:44:49 +02:00
Christina Quast
3eab56e079
ISO7816_Init with more parameters, slave/master clock
2015-04-10 15:38:49 +02:00
Christina Quast
95d6616ba1
Split init into configure and init
...
* Implemented configure, init, exit functions:
When a configuration is changed, interrupts for reset pins
should be disabled
* Moved variables shared between code files to simtrace.h
2015-04-09 22:38:47 +02:00
Christina Quast
abcf3038d2
gitignore: Ignore ctags file
2015-04-09 19:47:45 +02:00
Christina Quast
bf464ae566
Moved ccid related files to bord related folders
2015-04-09 19:47:45 +02:00
Christina Quast
6b02775638
phone.c: Check return values of USB_Write
2015-04-09 19:47:27 +02:00
Christina Quast
e2dddd5885
Renamed simtrace_src to src_simtrace
2015-04-09 17:40:48 +02:00
Christina Quast
590c221893
Remove redundant ccid files in atmel lib
2015-04-09 17:06:16 +02:00
Christina Quast
aab3d7c82b
phone.c: Check status val in Callback func
2015-04-09 17:02:17 +02:00
Christina Quast
6038eebaf7
cciddriver.h: Include USBD.h, remove function def
2015-04-09 16:55:48 +02:00
Christina Quast
b878df92f4
cciddriver.c: Check USB status in Callback
2015-04-09 16:54:36 +02:00
Christina Quast
7dab6abf47
cciddriver.c: Replace USBD_Write with CCID_Write
2015-04-09 16:53:32 +02:00
Christina Quast
362a4da94a
simtrace.py: Sleep a sec after changing the config
2015-04-09 13:39:38 +02:00
Christina Quast
20a6814c46
cciddriver.c: Fixed slot status bugs
...
The atmel lib takes the wrong values to signalize the current
slot status to the PC.
2015-04-09 13:36:28 +02:00
Christina Quast
7f634868dd
cciddriver.c: Off by one error when setting config
2015-04-09 13:34:53 +02:00
Christina Quast
c870b52233
iso7816: Hold RST line low for longer time period
...
Based on the sniff with a logic analyzer the time when the RST line
is holded low by simtrace is too short.
A better timeout value should be searched for later anyways.
2015-04-09 13:31:58 +02:00
Christina Quast
2831b8c1a0
cciddrv: Remove MIN macro
2015-04-09 09:02:50 +02:00
Christina Quast
55cd8734be
Makefile: 'make log' for debug dumps over serial
2015-04-08 00:12:17 +02:00
Christina Quast
7b6f7b084a
phone.c: Rename state NONE to WAIT_FOR_RST
2015-04-07 21:17:41 +02:00
Christina Quast
90393b3392
phone.c: Replace defines with enum
2015-04-07 21:15:12 +02:00
Christina Quast
4396fee97e
Rename simtrace/ to simtrace_src
2015-04-07 21:12:53 +02:00
Christina Quast
86bf2c3f4d
atmellib: Remove pngs in usb/
2015-04-07 21:03:12 +02:00
Christina Quast
0cc6142506
Remove USBLib_Trace.h
2015-04-07 20:53:45 +02:00
Christina Quast
b6f77d390c
Makefile: Compile silently and show code files used
2015-04-07 20:51:44 +02:00
Christina Quast
29c99b97af
Makefile: Enabled iprintf, removed comment
2015-04-07 20:13:44 +02:00
Christina Quast
85951cef7f
Deleted unused examples folder
2015-04-07 20:06:51 +02:00
Christina Quast
b0bbb1b52e
Removed sym links, replaced them with actual folders
2015-04-07 20:04:19 +02:00
Christina Quast
fbcd8a1bfd
simtrace: Rename main
2015-04-07 19:43:18 +02:00
Christina Quast
2279b75c26
gitignore: stop ignoring main.c
2015-04-07 19:38:44 +02:00
Christina Quast
d0339af87b
Removed unused code and header files from atmel lib
...
Also, remove includes of unused header files in chip.h
2015-04-07 19:30:47 +02:00
Christina Quast
d3f1638f1b
Deleted folder minimal
2015-04-07 18:24:36 +02:00
Christina Quast
5a67c0fef3
Renamed main folder to firmware
2015-04-07 18:24:06 +02:00
Christina Quast
f5cd7efede
Remove mains/ and sub-files
2015-04-07 18:21:14 +02:00
Christina Quast
58c1ae31ee
Makefile: local openocd config folder
2015-04-07 18:19:13 +02:00
Christina Quast
767fdeb0ca
iso7816.c:Solve compiler sign compare warn with pragma
2015-04-07 13:50:23 +02:00
Christina Quast
73c2b6498b
iso7816_4.c: GetChar returns status
2015-04-07 13:49:26 +02:00
Christina Quast
b2d5aeb850
ccid.c: Remove test code
2015-04-07 12:51:11 +02:00
Christina Quast
fe25784411
simtrace_iso7816.c: removed unused fct get_buf_start
2015-04-06 23:30:47 +02:00
Christina Quast
b06fc38939
usb.c: fix compiler warning USBConfigurationDescriptor
2015-04-06 23:30:21 +02:00
Christina Quast
46f5ccabb1
cciddriver.c: comment out unused USBDCallbacks_RequestReceived
2015-04-06 23:29:42 +02:00
Christina Quast
4b1e98d058
cciddriver.c: Directly access configurationDescriptorsArr
2015-04-06 23:28:41 +02:00
Christina Quast
3debfd6595
Bugfix: ccid.c: Remove dead code
2015-04-06 23:26:38 +02:00
Christina Quast
ca005698dd
Bugfix: Compiler warning RST pin type
2015-04-06 23:26:14 +02:00
Christina Quast
c063cfe887
phone.c: Removed redundant definition of PR
2015-04-06 21:34:43 +02:00
Christina Quast
2f27c7c3d2
phone.c: Fixed incompatible pointer type comparison
2015-04-06 20:46:40 +02:00
Christina Quast
e76a3ee499
phone.c: Removed dead code (rst_cnt)
2015-04-06 20:43:11 +02:00
Christina Quast
a4d1d1619b
phone.c: Remove double define of waittime
2015-04-06 20:41:50 +02:00
Christina Quast
443e55017d
phone.c: remove dot printout
2015-04-06 20:38:51 +02:00
Christina Quast
fab4ce958f
Bug fix: board.h: corrected definition of phone clk
2015-04-06 20:22:59 +02:00
Christina Quast
076396fdd3
Makefile: disable format warnings
2015-04-06 19:57:53 +02:00
Christina Quast
c1cc1b7b3e
Remove any Baselibc remains from Makefile
2015-04-06 19:52:42 +02:00
Christina Quast
5958587fd1
Impl of _write for usage by newlib printf
2015-04-06 19:47:22 +02:00
Christina Quast
1e15cb6616
Uart_console: remove custom printf
2015-04-06 19:26:50 +02:00
Christina Quast
ca39e16797
tc_etu.c: newline in printout inserted
2015-04-06 19:19:16 +02:00
Christina Quast
82ba0ac6d8
Phone.c: remove unused ep finder function
2015-04-06 19:08:37 +02:00
Christina Quast
6f664a3cc2
mitm.py: read atr on startup, do not reset card to retrieve atr
2015-04-06 19:08:04 +02:00
Christina Quast
7741f7159c
ccid_raw.py: Reset smartcard method
2015-04-06 19:06:05 +02:00
Christina Quast
bdaa95484c
Bug fix: Fix endless loop when ATR is not received
...
Without this fix, if the host software does not send an ATR, simtrace
waits for this answer in an endless loop of unsuccessfull USB
endpoint write attempts.
2015-04-06 00:52:08 +02:00
Christina Quast
5163624c24
ccid_raw.py: ATR function
2015-04-06 00:44:50 +02:00
Christina Quast
14fbf9c8ad
phone.c: more debug info in send_ATR
2015-04-06 00:36:12 +02:00
Christina Quast
88c7fa1bad
mitm.py: using new ccid_raw.py functions
2015-04-06 00:35:03 +02:00
Christina Quast
5149cd6e78
simcard communication python class
2015-04-06 00:33:52 +02:00
Christina Quast
267afe37ec
Constants: simcard command definition
2015-04-06 00:27:33 +02:00
Christina Quast
2a3dd553e1
Requirements.txt
2015-04-05 16:37:14 +02:00
Christina Quast
21eddea4bb
Symlink to pySim module
2015-04-05 16:35:28 +02:00
Christina Quast
a1d49e74d0
Ignore python venv folder
2015-04-05 16:26:09 +02:00
Christina Quast
7821b1fc1b
Installed pysim as submodule
...
Could not install it using pip.
Setup.py missing
2015-04-05 16:24:17 +02:00
Christina Quast
097b21849f
ccid_raw.py: main function with test functions
2015-04-05 10:21:11 +02:00
Christina Quast
3041854872
phone.c: Changed bus switch from sniffer to phone mode
...
In order to record the communication between simtrace and the
mobile phone with a logic analyzer I had to configure the
pins in sniffer mode in order to attach the sniffer clips
to the SIM card slot. I did not manage to connect them to
the connector to the phone flex cable.
2015-04-05 10:08:06 +02:00
Christina Quast
80050a5c98
simtrace.py: Added mitm option
2015-04-04 20:00:15 +02:00
Christina Quast
95270b1903
mitm.py: import modules, added exceptions
2015-04-04 19:59:03 +02:00
Christina Quast
3252a317d5
ccid_raw.py: removed test functions calls
2015-04-04 19:57:16 +02:00
Christina Quast
e01fb9a146
usb.c: mitm config with ccid interface
2015-04-04 19:56:23 +02:00