RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 03:03:14 +08:00
Code Issues Projects Releases Packages Wiki Activity
5319 commits 3 branches 15 tags 87 MiB
Commit graph

1432 commits

Author SHA1 Message Date
iceman1001
a89ae9cb35 check return value from zlib inflateInit2... 2019-04-08 08:08:47 +02:00
iceman1001
ef610f373a style 2019-04-07 16:21:27 +02:00
Philippe Teuwen
8c359921e9 keybytes for MifareUC_Auth 2019-04-07 12:30:49 +02:00
Philippe Teuwen
7485c5ed2e armsrc BitStream -> bits 2019-04-07 12:23:34 +02:00
Philippe Teuwen
9c3a520300 iso14443a_select_card resp_data -> p_card 2019-04-07 12:18:20 +02:00
iceman1001
6cc62b7985 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-07 12:11:08 +02:00
iceman1001
7eee2acfbf more crc overshadow 2019-04-07 12:10:52 +02:00
Philippe Teuwen
a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001
c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
iceman1001
91897f1f2e copy bytes 2019-04-07 12:06:48 +02:00
iceman1001
1e35130fbe missing include 2019-04-07 11:41:43 +02:00
iceman1001
4856252912 styles 2019-04-07 11:39:49 +02:00
iceman1001
49a0fda10b styles 2019-04-07 11:36:24 +02:00
iceman1001
c9b3dd32d1 remove random 2019-04-07 11:00:28 +02:00
iceman1001
ff74d56741 remove unused 2019-04-07 10:58:50 +02:00
iceman1001
593202867a remove include 2019-04-07 10:56:35 +02:00
iceman1001
3ab9dbe4c6 fix styles 2019-04-07 10:52:52 +02:00
iceman1001
8e6920cd95 fix styles and warnings 2019-04-07 10:40:59 +02:00
iceman1001
db78d26b9f styles 2019-04-07 10:33:34 +02:00
iceman1001
da7dc2353c style and warnings 2019-04-07 10:30:52 +02:00
iceman1001
aea6c6d3c5 fixes, shadow 2019-04-07 10:17:43 +02:00
Philippe Teuwen
ebdfba033d arg names 2019-04-06 20:35:58 +02:00
Philippe Teuwen
a52a0bf537 args names 2019-04-06 20:21:03 +02:00
Philippe Teuwen
a27d549a60 WritePageHitagS: why on earth page <> page_ 2019-04-06 19:48:20 +02:00
Philippe Teuwen
1b9914288d remove extern 2019-04-06 19:10:34 +02:00
Philippe Teuwen
41f36ca20b make style 2019-04-06 19:09:01 +02:00
Philippe Teuwen
2603c8d0d1 Merge branch 'hf_mf_sim' of git://github.com/vratiskol/proxmark3 into vratiskol-hf_mf_sim 
* 'hf_mf_sim' of git://github.com/vratiskol/proxmark3:
  Astyle
  Verbose mode
  ReSync file
  Add Encrypted data test
  Mifare 10B UID
  cardAUTHKEY log
  Remove FLAG_RANDOM_NONCE
  Mifare Sim
  LogTrace
  Log Level
  Use Variable
  Add Variable for MAX_MIFARE_FRAME_SIZE
  Add Data Block debug
  Correct flags & test
  Correct return
  Revert "Merge branch 'master' into hf_mf_sim"
  Sync from Upstream
  Astyle update
  hf mf sim
 2019-04-06 19:06:16 +02:00
iceman1001
127dc74674 chg: only english 2019-04-06 15:50:45 +02:00
Philippe Teuwen
b666c27f3c
Merge branch 'master' into hf_mf_sim 2019-04-06 01:22:15 +02:00
Philippe Teuwen
26eb54b965 style 2019-04-06 01:00:54 +02:00
vratiskol
567ceb017b Astyle 2019-04-06 00:39:27 +02:00
vratiskol
2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
vratiskol
e24a0cfe17 Verbose mode 2019-04-06 00:32:11 +02:00
iceman1001
1773cfcf39 style 2019-04-05 18:51:19 +02:00
vratiskol
bc11ff88ea Add Encrypted data test 2019-04-05 03:58:15 +02:00
vratiskol
0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
Eloff
19cf50a6ff Mifare Ultralight/NTAG simulation. Add WRITE and COMPATIBLE_WRITE support 2019-04-03 22:26:18 +03:00
vratiskol
1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +02:00
Philippe Teuwen
07cc0d0a29 make style helped revealing my bug :) 2019-04-02 22:34:00 +02:00
Philippe Teuwen
64ce30c06c make style 2019-04-02 22:32:45 +02:00
Philippe Teuwen
21be6d4400 FPC: got RX working, got client over usart somehow working..., see detailed commit msg 
* using WITH_FPC:
  * activate basic usart
  * no double buffer for now, no interrupt
  * usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
    * pm3 client over USB, minicom over usart
    * analyse a d 414243
* using WITH_FPC_HOST:
  * it implies WITH_FPC as it's based on it
  * control pm3 with client over usart
  * EXPERIMENTAL! still some frame desync issues
  * you can connect both from usart & USB with two pm3 clients
    * actually you *have* to connect USB for the moment because
      it's used to send debug messages about buggy usart... See Dbprintf_usb below
  * "sessions": msgs are directed to the latest client to have sent a cmd
  * Dbprintf_usb macro to send msgs to USB client to help debugging usart...
  * We now have an option to run client at different speed as usart is 115200:
    client/proxmark3 /dev/ttyUSB0 -b 115200
  * Consequently, argc,argv handling is a bit revamped, it was so messy...
  * USB and flashing are still at 460800, don't try flashing over usart yet ^^
 2019-04-02 22:06:10 +02:00
Philippe Teuwen
7bd95dd5c3 FPC experiments: got so far TX_only, usart=115200 + usb=460800, see full commit msg 
* Add \r\n to sent strings
* remove usart_init() from UsbPacketReceive cmd, it's already init in main.
* Add PLATFORM PM3RDV4FPC to ease dev
* TX: US_TCR is len of data to send, not len of buffer
* Use only one PDC bank as we're using it in sync
* Busy loop to wait for end of TX as we'using it in sync
* Change usart speed to 115200
* Don't downgrade USB speed, keep 460800
* Attempt to detect received data, fail so far
 2019-04-02 01:06:03 +02:00
Philippe Teuwen
21b063da93 t55xx readblock: don't delay acquisition too much else we're sometimes off by one (observed when reading P1B1 on several cards) 2019-03-31 03:02:09 +02:00
Philippe Teuwen
4b00dd1053 lf write: leds 2019-03-31 01:14:20 +01:00
Philippe Teuwen
032062cfe9 Indala 64 on T55x7: use PSK1 2019-03-30 23:01:22 +01:00
vratiskol
4bef914653 Mifare 10B UID 2019-03-28 15:18:53 +01:00
Philippe Teuwen
db4aa08b78 make style 2019-03-28 14:19:41 +01:00
vratiskol
edfce24cad cardAUTHKEY log 
Add key type as A or B
 2019-03-28 00:37:48 +01:00
vratiskol
8f11fcc193 Remove FLAG_RANDOM_NONCE 2019-03-27 22:35:11 +01:00
iceman1001
459835b5ca fix: 'hf mf sim' - Mifare simulation now works against Android etc. Thanks to @eloff 2019-03-27 15:29:45 +01:00