dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,247 Commits 7 Branches 1 Tag
2603c8d0d175cd301ffa62c438c0dd8bb44ecc84
Commit Graph

1406 Commits

Author SHA1 Message Date
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
vratiskol
a068f7c2bc Mifare Sim 
Compilation OK
Emulation 1k OK with android
 2019-03-27 14:18:26 +01:00
vratiskol
60ac8b8934 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 10:08:49 +01:00
iceman1001
52be3f4fe5 chg: 'lf indala clone' - differnt input parms. '-L' gives a long UID. 
chg: 'lf indala demod' - tries to descramble parts,  and detection is changed.  Still issues with PSK2..
 2019-03-26 09:09:43 +01:00
vratiskol
04c14d1931 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 15:51:21 +01:00
iceman1001
c939d99884 chg: remove LDC mod be default 2019-03-25 15:11:38 +01:00
vratiskol
3b06c9d8ee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 20:46:56 +01:00
iceman1001
ca9061bd32 changed byte_t -> uint8_t 2019-03-21 15:19:18 +01:00
vratiskol
e26677f841 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 14:45:08 +01:00
iceman1001
ffdd91cab6 add: 'hf 14a info' - uid changeable tests, finds two kinds of Gen2 / CUID. 4byte / 7byte but there other Gen2 cards which will not be detected by this. 2019-03-21 12:53:05 +01:00
vratiskol
c8a805c99c LogTrace 2019-03-19 17:09:16 +01:00
vratiskol
49f0b35ffd Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 16:48:45 +01:00
iceman1001
a41d6fbfb2 style 2019-03-19 10:26:52 +01:00
iceman1001
42bbf6a761 style 2019-03-19 10:26:36 +01:00
vratiskol
c08c14656b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:26:57 +01:00
iceman1001
433f84ca0d style 2019-03-18 22:25:21 +01:00
vratiskol
c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001
aa28143e16 style 2019-03-18 20:16:04 +01:00
iceman1001
4706d27903 reassigned 2019-03-18 20:11:19 +01:00
iceman1001
0ed99ce0c4 unsigned variables cant be negative 2019-03-18 17:16:27 +01:00
iceman1001
03f89d2f3f chg: details 2019-03-18 13:44:51 +01:00
iceman1001
f24416a71e clean 2019-03-18 13:42:17 +01:00
iceman1001
dcec5627d1 chg: unsigned byte can't be less than zero. 2019-03-18 13:41:59 +01:00
vratiskol
86955c1de2 Log Level 2019-03-18 13:36:36 +01:00
iceman1001
e925dc9f7a clean 2019-03-17 21:53:26 +01:00
iceman1001
ca24b7ae74 chg: 'hf 14a sim' - send 4bit ACK/NACK responses 2019-03-17 21:52:14 +01:00
vratiskol
619ef2ba37 Use Variable 2019-03-16 03:46:36 +01:00