RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 23:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
6068 commits 3 branches 14 tags 85 MiB
Commit graph

3932 commits

Author SHA1 Message Date
Philippe Teuwen eebea8c088 DbpStringEx using reply_ng 2019-04-22 01:33:32 +02:00
Philippe Teuwen 913c03d3c4 Reset WaitForResponse timeout every time we get a packet 
as cmds sending a lot of Dbprintf msgs can take ages on slow links
e.g. "hw status" on 9600 baud link takes 26.5s with "reply_old" Dbprintf
 2019-04-21 23:56:08 +02:00
Philippe Teuwen 75ee60f267 WaitForResponseTimeoutW: fix, no communication_delay when timeout=-1 2019-04-21 23:26:51 +02:00
Eloff db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen 4aa1b49493 fix uart_posix: bytecound must be 32b 2019-04-21 01:05:02 +02:00
Philippe Teuwen 6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
Philippe Teuwen a7773b3395 Introduce reply_mix, to still get some varlen on old API 2019-04-20 03:17:19 +02:00
Philippe Teuwen 3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +02:00
Philippe Teuwen 95822d8360 minor 2019-04-20 01:49:37 +02:00
Philippe Teuwen 238fc10c9a style 2019-04-20 01:08:07 +02:00
Philippe Teuwen 7331b7d6d2 Merge branch 'master' into experimental_varlen 
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
 2019-04-19 23:17:36 +02:00
Philippe Teuwen c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
Eloff 52d1b7341f typo 2019-04-19 09:39:11 +03:00
Philippe Teuwen 128d90ca3c SendCommandOLD: hid-flasher 2019-04-19 02:10:52 +02:00
Philippe Teuwen b68ccfa7b8 SendCommandOLD : comms & flash 2019-04-19 02:01:47 +02:00
Philippe Teuwen 2ac5482d9c SendCommandOLD & errors retval: mifarehost 2019-04-19 01:45:45 +02:00
Philippe Teuwen 45afe8dec0 errors retval for cmdemv 2019-04-19 01:14:58 +02:00
Philippe Teuwen a6f52e839f fix bug 2019-04-19 01:14:04 +02:00
Philippe Teuwen 1b6a45ac17 propagate CmdsParse return value 2019-04-19 00:47:51 +02:00
Philippe Teuwen 38fc6e2290 errors: cmdmain 2019-04-19 00:42:25 +02:00
Philippe Teuwen dcfee8963b SendCommandOLD & errors: cmdflashmem 2019-04-18 23:26:12 +02:00
Philippe Teuwen 7dbd12ad27 SendCommandOLD: cmdhw 2019-04-18 22:42:15 +02:00
Philippe Teuwen 9bd59a8d40 Add SendCommandOLD 2019-04-18 22:19:28 +02:00
Philippe Teuwen b860cc6eaf Rename MAGIC defines 2019-04-18 21:49:37 +02:00
Philippe Teuwen 8c89b35f1e style 2019-04-18 21:41:48 +02:00
Philippe Teuwen 9ff841efb2 CRC optional, replaced by magic on USB 2019-04-18 21:39:35 +02:00
Eloff 960b21793c 'hf mf sim' full-byte anti-collision frame support 2019-04-18 21:02:48 +03:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 0e855f647a typo 2019-04-18 10:45:24 +02:00
Oleg Moiseenko 1d60cf3bd6
Merge pull request #169 from merlokk/sf 
smallfix
 2019-04-18 11:26:21 +03:00
merlokk 8bf8f1735e smallfix 2019-04-18 11:25:57 +03:00
Philippe Teuwen 4e31c6110b Better Command structs 2019-04-18 00:12:52 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen 64eb93c9c4 style 2019-04-17 22:08:10 +02:00
Philippe Teuwen 7cbcf8163c Merge branch 'master' into experimental_varlen 
* master: (27 commits)
  textual
  style redundant assignment
  timeout fix
  small fix
  add termcap
  add readline and small fix
  rdp
  textual
  null term?
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
  add dlls to release
  style
  style
  test fix
  test fixes
  another fix
  fix memleak
  fix
  textual
  use printandlogex
  ...
 2019-04-17 22:06:39 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 587d826f84 textual 2019-04-17 20:36:10 +02:00
iceman1001 2783ba7583 style redundant assignment 2019-04-17 19:48:29 +02:00
iceman1001 b574db169e textual 2019-04-17 16:56:52 +02:00
iceman1001 853d2e14e6 null term? 2019-04-17 16:53:28 +02:00
iceman1001 ec7ab1a4ed fix: https://github.com/RfidResearchGroup/proxmark3/issues/166 2019-04-17 16:52:58 +02:00
iceman1001 3207aaea67 style 2019-04-17 14:57:21 +02:00
iceman1001 1ee3679a98 style 2019-04-17 14:54:42 +02:00
iceman1001 da2aa2c55f test fix 2019-04-17 14:50:07 +02:00
iceman1001 524346901a test fixes 2019-04-17 14:48:32 +02:00
iceman1001 e0bd6b2019 another fix 2019-04-17 14:39:47 +02:00
iceman1001 2044fd4130 fix memleak 2019-04-17 14:35:22 +02:00
iceman1001 f5b7371d7c fix 2019-04-17 14:33:09 +02:00
iceman1001 72f6ba712a textual 2019-04-17 14:01:05 +02:00
iceman1001 bc0e9687d7 use printandlogex 2019-04-17 13:45:55 +02:00
iceman1001 6930ca5785 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-17 12:01:33 +02:00
iceman1001 01b83482a7 use printandlogex 2019-04-17 11:58:44 +02:00
iceman1001 53b48ae6a9 use printandlogex 2019-04-17 11:55:52 +02:00
iceman1001 3fdac2577f use printandlogex 2019-04-17 11:54:40 +02:00
iceman1001 d89a5d0a5e use printandlongex 2019-04-17 11:48:17 +02:00
iceman1001 002e6b23fe Use printandlogex 2019-04-17 11:47:32 +02:00
Philippe Teuwen 8bfc5c1b47 New reply frames reception 2019-04-17 01:06:26 +02:00
Philippe Teuwen 96843c3f47 New reply frames transmission (reception still to be done) 2019-04-16 23:15:23 +02:00
Philippe Teuwen 4eaa2fc5aa move common util fcts to /common to avoid common files (e.g. crc) to depend on non-common files 2019-04-16 23:02:40 +02:00
Eloff 63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03:00
Philippe Teuwen 8b99df9074 Merge branch 'master' into experimental_varlen2 
* master: (33 commits)
  unified Proxmark3 text
  removed
  more colors
  rearranged banner output and messages
  textual
  revert
  revert
  revert
  style spaces
  fix fake com port
  style
  style
  styles
  not null?
  style
  style
  style
  style
  style
  style
  ...
 2019-04-16 20:58:58 +02:00
Philippe Teuwen 83571f02a0 style 2019-04-16 20:49:32 +02:00
iceman1001 436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
Philippe Teuwen 44bbb7d2c7 new frame format, smaller and with crc. Some code simplified 2019-04-16 20:00:17 +02:00
iceman1001 33b4a32dfd removed 2019-04-16 19:06:18 +02:00
iceman1001 8657e17a0b more colors 2019-04-16 17:29:19 +02:00
iceman1001 2639de23c6 rearranged banner output and messages 2019-04-16 17:26:15 +02:00
iceman1001 74ece72b26 textual 2019-04-16 17:21:42 +02:00
iceman1001 aaedeafbb1 style spaces 2019-04-16 16:56:56 +02:00
iceman1001 d17191d0a4 style 2019-04-16 16:11:46 +02:00
iceman1001 c6aa14efb7 style 2019-04-16 16:07:25 +02:00
iceman1001 f50566225c styles 2019-04-16 16:02:03 +02:00
iceman1001 eae370fc3d not null? 2019-04-16 15:51:13 +02:00
iceman1001 a6f145bd1a style 2019-04-16 15:47:21 +02:00
iceman1001 d8f756fd14 style 2019-04-16 15:43:53 +02:00
iceman1001 7b30126371 style 2019-04-16 15:29:18 +02:00
iceman1001 1c4a7709da style 2019-04-16 15:27:25 +02:00
Philippe Teuwen 34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02:00
merlokk 934fb42a95 Jablotron ID length fix 2019-04-15 18:04:12 +03:00
Philippe Teuwen 62f46d6544 Use PrintAndLogEx 2019-04-14 18:51:07 +02:00
Philippe Teuwen 9a7bba2438 Move UART open msg to avoid flood in wait mode 2019-04-14 18:49:19 +02:00
Philippe Teuwen ba926a91e5 more yellow 2019-04-14 18:38:06 +02:00
Philippe Teuwen 04c0384d3e Testing pm3 communication 2019-04-14 17:25:17 +02:00
Philippe Teuwen 3cba736841 baudrate for usart: use define and limit to 115200 only for WITH_FPC_HOST 2019-04-14 14:42:03 +02:00
Philippe Teuwen 9676d788e0 style 2019-04-14 13:37:53 +02:00
Philippe Teuwen 681c8fd22a main: use proper executable name, especially for mingw 2019-04-14 13:35:52 +02:00
Philippe Teuwen e708d86306 Rework command line options 2019-04-14 12:54:37 +02:00
iceman1001 d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001 e9db49be1e chg: 'data rawdemod' - enhanced command params 2019-04-14 11:13:31 +02:00
iceman1001 dd404a67a1 Fix: USART - default speeds is lower (@ryan) 2019-04-14 11:09:31 +02:00
Philippe Teuwen 4763eb417a fix coverity warnings 2019-04-14 11:05:32 +02:00
iceman1001 0a9d2ca03d lets see if cexpf can be removed now. 2019-04-14 07:41:25 +02:00
Philippe Teuwen 8d94d2d67f comparison of integers of different signs [-Wsign-compare] 2019-04-14 00:45:27 +02:00
Philippe Teuwen 15f0fef555 Fix data shiftgraphzero corrupting end of GraphBuffer 2019-04-13 23:57:26 +02:00
Philippe Teuwen 993728072a comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:55:58 +02:00
Philippe Teuwen 97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen ce606b51fc Handle explicitly enum vals in switch [-Wswitch-enum] 2019-04-13 22:46:08 +02:00
Philippe Teuwen b6ee94ec8e style 2019-04-13 22:07:58 +02:00
Philippe Teuwen 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001 4572acc1eb cleaning out the helptext 
mingw got some bad asciiarts
 2019-04-13 13:34:02 +02:00
iceman1001 e20a47478f comment away my playground 2019-04-13 03:07:53 +02:00
iceman1001 dae0016bb2 times times times 2019-04-13 03:01:31 +02:00
iceman1001 22f8440183 struct 2019-04-13 02:51:33 +02:00
iceman1001 0a8c303685 move defines 2019-04-13 02:49:15 +02:00
iceman1001 1cb83e78a5 localtime, gmtime replaced 2019-04-13 02:45:53 +02:00
iceman1001 361cd83fce gmtime_r 2019-04-13 02:41:46 +02:00
iceman1001 48e1a7648e posix 2001 2019-04-13 02:30:00 +02:00
iceman1001 ecf282a54c missing include 2019-04-13 02:18:49 +02:00
iceman1001 f05566c834 missing pointers.. 2019-04-13 02:16:22 +02:00
iceman1001 a27348c592 replaced with threadsafe strtok_r call 2019-04-13 02:13:23 +02:00
iceman1001 85b4463000 style 2019-04-13 02:10:44 +02:00
iceman1001 f8a533af5d style 2019-04-13 02:09:23 +02:00
iceman1001 4cadd8c2ee style 2019-04-13 02:04:40 +02:00
iceman1001 ef46e3af29 style 2019-04-13 01:47:10 +02:00
iceman1001 618e31e920 style 2019-04-13 01:46:10 +02:00
Philippe Teuwen 4f32655004 use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-13 00:25:43 +02:00
Philippe Teuwen 05374fce07 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes] 2019-04-12 19:41:56 +02:00
Philippe Teuwen 65305f361f no comment :( 2019-04-12 15:12:01 +02:00
Philippe Teuwen 1cb2ae889c Avoid Coverity BAD_COMPARE, but honestly I don't get it at all... 
int readCOTAGUid(void) {
>>>     CID 337768:  Incorrect expression  (BAD_COMPARE)
>>>     This implicit conversion to a function pointer is suspicious: "CmdCOTAGRead > NULL".
130         return CmdCOTAGRead > 0;

This is just an int compared to zero, why it thinks it's a null pointer??
 2019-04-12 13:43:36 +02:00
iceman1001 e7f4f615c0 unified text 2019-04-12 10:55:09 +02:00
iceman1001 d8ab476022 fix: 'hf legic info' - unsegmented card now uses card size to calc remaining length. Also made the output at bit more clear and colorful 2019-04-12 10:20:53 +02:00
Philippe Teuwen 8aa5b42cdf Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 02:07:11 +02:00
Philippe Teuwen f6a6ec8447 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 01:55:25 +02:00
Philippe Teuwen 7d48ad19f9 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 01:00:54 +02:00
Philippe Teuwen 20393d71a8 hardnested_tables: add C99 flag in suggested compilation 2019-04-11 19:43:48 +02:00
iceman1001 6609db82ab textual 2019-04-11 17:20:08 +02:00
iceman1001 a872f04c1e textual 2019-04-11 17:19:48 +02:00
iceman1001 fb8d7c3efa textual 2019-04-11 17:18:17 +02:00
iceman1001 7547952a4d style 2019-04-11 07:40:50 +02:00
Iceman 7483e56249
Merge pull request #155 from davidbeauchamp/hid36bit 
Add 36bit HID format, extend calcWiegand() to include oem bits
 2019-04-11 07:33:12 +02:00
David Beauchamp 5317fa0277 Restore log level 2019-04-10 20:44:21 -04:00
David Beauchamp 8d479e3a68 Add 36bit HID format, extend calcWiegand() to include oem bits 2019-04-10 20:34:42 -04:00
Philippe Teuwen 2879599ac4 #ifndef on all header files 2019-04-11 01:16:25 +02:00
Philippe Teuwen 35e97ba96a static 2019-04-11 00:10:21 +02:00
Philippe Teuwen 6416de1a38 emv_tags [-Wmissing-field-initializers] 2019-04-10 23:13:00 +02:00
Philippe Teuwen 3cd047be5d oops typo 2019-04-10 22:47:18 +02:00
Philippe Teuwen 0fe323de80 asn1_tag: remove unused field and initialize the others [-Wmissing-field-initializers] 2019-04-10 22:33:12 +02:00
Philippe Teuwen 34aa860fbd more [-Wmissing-field-initializers] 2019-04-10 22:20:45 +02:00
Philippe Teuwen 919cfb5841 more [-Wmissing-field-initializers] 2019-04-10 15:01:19 +02:00
Philippe Teuwen 0ab6de64d4 structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers] 2019-04-10 13:59:00 +02:00
iceman1001 af3397bd19 chg: 'lf indala demod' - textual 2019-04-10 13:46:51 +02:00
iceman1001 097835e684 fix nedap clone helptext. all waiting for the nedap clone cmd ... 2019-04-10 13:32:35 +02:00
iceman1001 2c68edfad4 fix indala clone/demod helptext 2019-04-10 13:31:09 +02:00
Philippe Teuwen 0ce9e37fb7 Remove duplicate helptext 2019-04-10 13:17:38 +02:00
Philippe Teuwen 3d6d58aae5 internal help fcts -> static 2019-04-10 13:06:05 +02:00
Philippe Teuwen cc0454d5d2 tag unused Cmd [-Wunused-parameter] 2019-04-10 12:23:40 +02:00
Philippe Teuwen 7f76fea21a good const, bad const, fixing -Wincompatible-pointer-types-discards-qualifiers 2019-04-10 10:21:42 +02:00
osboxes.org e703dcb8ad style 2019-04-10 09:49:42 +02:00
osboxes.org 598d016477 style 2019-04-10 09:47:46 +02:00
osboxes.org acf3920394 style 2019-04-10 09:47:36 +02:00
osboxes.org ffd2c92584 style 2019-04-10 09:46:01 +02:00
osboxes.org ba45da1c28 style 2019-04-10 09:38:33 +02:00
osboxes.org 827cd721fe style 2019-04-10 09:37:46 +02:00
osboxes.org ad52243981 style 2019-04-10 09:36:23 +02:00
iceman1001 2b582c9bd0 unused 2019-04-10 09:00:38 +02:00
iceman1001 9c78f4d6d0 unused 2019-04-10 08:58:08 +02:00
iceman1001 84233a8f85 unused 2019-04-10 08:57:23 +02:00
iceman1001 0a43c80dff unused 2019-04-10 08:55:29 +02:00
iceman1001 d5dc1156e1 unused 2019-04-10 08:54:33 +02:00
iceman1001 1809d6c839 unused 2019-04-10 08:52:45 +02:00
Philippe Teuwen 6d0ee581fd ease hardnested_tables compilation, in case we figure out what to do with it some day 2019-04-09 22:50:04 +02:00
Philippe Teuwen 55ac61e145 remove redundant buffer init 2019-04-09 22:43:29 +02:00
Philippe Teuwen 28ca3e8c22 on prototypes, void means sth 2019-04-09 22:42:23 +02:00
iceman1001 9c74a96c9b unused 2019-04-09 21:40:25 +02:00
iceman1001 cf21db6f38 unused 2019-04-09 21:38:04 +02:00
iceman1001 c19b5977d4 unused 2019-04-09 21:36:52 +02:00
iceman1001 3f2d02b978 unused 2019-04-09 21:36:14 +02:00
Philippe Teuwen 2ebf940bf0 PrintAndLogEx: use const on char *fmt 2019-04-09 21:25:11 +02:00
Philippe Teuwen a561370f8d more strncpy fix 2019-04-09 20:15:08 +02:00
Philippe Teuwen df55154649 more 2019-04-09 20:08:35 +02:00
Philippe Teuwen 2f33682035 use sizeof 2019-04-09 20:05:27 +02:00
Philippe Teuwen ff194eb861 CmdHF15Write: make sure truncated string is null-terminated 2019-04-09 20:02:41 +02:00
Philippe Teuwen 258332894b hardnested: get rid of shift by negative value 2019-04-09 17:49:02 +02:00
iceman1001 87660df8f2 fix: 'hf mf hardnested' - not verify key when reading nonce file 2019-04-09 17:14:47 +02:00
iceman1001 ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
Fl0-0 be90c76f47 Fix sizes for GCC 8.2 string truncation warnings 2019-04-09 09:45:06 +02:00
iceman1001 b0d627bae5 check returnvalue 2019-04-08 14:41:06 +02:00
iceman1001 678293913c ccc 2019-04-08 14:22:50 +02:00
iceman1001 726e02b900 color 2019-04-08 14:22:04 +02:00
iceman1001 98d8405830 wrong includes 2019-04-08 12:58:26 +02:00
iceman1001 493a26b93a updated 2019-04-08 12:47:34 +02:00
iceman1001 cd85c57e11 style 2019-04-08 12:38:32 +02:00
iceman1001 cfe793bd22 pointers 2019-04-08 12:29:49 +02:00
iceman1001 b7b7db8ca4 unshadow crc16 2019-04-08 10:45:55 +02:00
iceman1001 4843726d7e unshadow bs_ones, bs_zeros 2019-04-08 10:36:58 +02:00
iceman1001 0e05faaf0c styles 2019-04-08 10:33:06 +02:00
iceman1001 0b6dce3363 styles 2019-04-08 10:30:20 +02:00
iceman1001 29d73046cc unshadow clock, the mysterious one 2019-04-08 10:21:28 +02:00
iceman1001 2b3e5b7aac style 2019-04-08 10:19:01 +02:00
iceman1001 ebe98723d4 unshadow 2019-04-08 10:17:08 +02:00
iceman1001 21d88ae2c2 unshadow, multiple defines. 2019-04-08 10:16:57 +02:00
iceman1001 91e34643ab unshadow 2019-04-08 10:14:22 +02:00
iceman1001 7f0b1eacd1 unshadow 2019-04-08 10:13:15 +02:00
iceman1001 a1d9b574fd style 2019-04-08 10:11:57 +02:00
iceman1001 5e1c5f72e1 styles 2019-04-08 10:10:48 +02:00
iceman1001 dcb83d2962 styles 2019-04-08 10:01:57 +02:00
iceman1001 e1d56b5f94 unshadow 2019-04-08 09:50:06 +02:00
iceman1001 2fc54ca667 unshadow clock.. the mysterious variable 2019-04-08 09:42:27 +02:00
iceman1001 854536b155 unshadow 2019-04-08 09:39:05 +02:00
iceman1001 eadc980835 unshadow 2019-04-08 09:26:39 +02:00
iceman1001 55cbedc600 styles 2019-04-08 09:24:31 +02:00
iceman1001 21fd059dc2 unshadow 2019-04-08 09:08:03 +02:00
iceman1001 ec278e60cc unshadow 2019-04-08 08:34:40 +02:00
iceman1001 a2176b722d fix 2019-04-08 08:28:43 +02:00
iceman1001 1815376ef5 style 2019-04-08 08:26:30 +02:00
iceman1001 8f2983368c style 2019-04-08 08:26:18 +02:00
iceman1001 075ccebfd5 unshadow 2019-04-08 08:23:11 +02:00
iceman1001 9328a8efbb fix 2019-04-08 08:15:28 +02:00
iceman1001 8d2c02878b simpler branching 2019-04-08 08:11:18 +02:00
iceman1001 a89ae9cb35 check return value from zlib inflateInit2... 2019-04-08 08:08:47 +02:00
iceman1001 f6a80e0dc8 funcArgNamesDifferent 2019-04-07 20:34:42 +02:00
iceman1001 514611e885 fix 2019-04-07 20:24:13 +02:00
iceman1001 f1a01dcc7b fix 2019-04-07 20:22:24 +02:00
iceman1001 8aa5dec805 styles 2019-04-07 20:21:14 +02:00
iceman1001 e95955b793 shadowing 2019-04-07 20:17:59 +02:00
iceman1001 648706d691 shadowing 2019-04-07 20:13:30 +02:00
iceman1001 f27d618a08 shadowing 2019-04-07 20:12:24 +02:00
iceman1001 b37981df74 shadow 2019-04-07 20:08:53 +02:00
iceman1001 c4d88c239b style 2019-04-07 19:21:24 +02:00
iceman1001 b6345a5df7 style 2019-04-07 18:44:15 +02:00
iceman1001 98d24a4fe8 style 2019-04-07 18:42:47 +02:00
iceman1001 c881acd631 more 2019-04-07 18:35:01 +02:00
iceman1001 4c4471331b fix 2019-04-07 18:32:03 +02:00
iceman1001 27003904ce printandlogs.. 2019-04-07 18:12:58 +02:00
iceman1001 8d9bd81020 never used assignments 2019-04-07 16:49:22 +02:00
iceman1001 9eba3a849a shadowing 2019-04-07 16:34:21 +02:00
iceman1001 03b44b324b assign 2019-04-07 16:30:02 +02:00
iceman1001 0ffe2a4700 shadowing 2019-04-07 16:25:19 +02:00
iceman1001 c65d782d73 shadowing 2019-04-07 16:23:07 +02:00
iceman1001 7bf24a170f style 2019-04-07 15:22:01 +02:00
iceman1001 d8f539c217 style 2019-04-07 15:20:27 +02:00
iceman1001 0b455607a9 fsize can't be zero 2019-04-07 12:41:29 +02:00
iceman1001 69ba2d6a5b rename variables in order to prevent a popular usbcommand named as c. 2019-04-07 12:33:33 +02:00
iceman1001 a7dea8f1e7 overshadowed buf. 2019-04-07 12:30:25 +02:00
iceman1001 1273971991 more crc 2019-04-07 12:14:16 +02:00
iceman1001 8003d95be9 crc 2019-04-07 12:13:05 +02:00
Philippe Teuwen b787ccf150 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  more crc overshadow
 2019-04-07 12:11:07 +02:00
Philippe Teuwen a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001 a8ad793f7f more crc overshadow 2019-04-07 12:10:04 +02:00
iceman1001 c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
iceman1001 7a24d7fdb6 chg: 'lf indala demod' - texual 2019-04-07 08:52:10 +02:00
Philippe Teuwen 24acbf86eb arg names 2019-04-06 22:15:57 +02:00
Philippe Teuwen 7259a27f05 Change printT55xxBlock API 2019-04-06 22:04:02 +02:00
Philippe Teuwen 50e131f99b arg names 2019-04-06 21:59:34 +02:00
Philippe Teuwen 51d6fa13eb arg names 2019-04-06 21:46:00 +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
Philippe Teuwen b666c27f3c
Merge branch 'master' into hf_mf_sim 2019-04-06 01:22:15 +02:00
Philippe Teuwen 98d9408746 make style 2019-04-06 00:52:55 +02:00
Philippe Teuwen 59d40068e2 style 2019-04-06 00:38:22 +02:00
vratiskol 2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
Philippe Teuwen 366c1ec901 style 2019-04-06 00:07:48 +02:00
Philippe Teuwen 9ff5a4e2fa style 2019-04-05 23:17:16 +02:00
Philippe Teuwen 84753b91c0 fix %u <> size_t compilation warning 2019-04-05 21:12:32 +02:00
Philippe Teuwen 841f20c5e5 test_t55x7 logs & stats 2019-04-05 19:34:05 +02:00
iceman1001 fa0a2914f6 style 2019-04-05 19:29:16 +02:00
iceman1001 4be92f129a style 2019-04-05 19:13:03 +02:00
iceman1001 ffdfe09659 style 2019-04-05 18:57:05 +02:00
iceman1001 d42b779cbe style 2019-04-05 18:55:31 +02:00
iceman1001 e7406de219 redundant. 2019-04-05 18:53:17 +02:00
iceman1001 ea5dddafef fix: invalidPrintfArg 2019-04-05 18:47:36 +02:00
iceman1001 82f4388abe style 2019-04-05 09:22:12 +02:00
iceman1001 6404c974b6 style 2019-04-05 09:20:37 +02:00
iceman1001 647dcc596f style 2019-04-05 09:18:52 +02:00
iceman1001 632e80e9b1 style 2019-04-05 09:16:01 +02:00
iceman1001 5b0eed26b5 style 2019-04-05 09:14:40 +02:00
iceman1001 774cbc5cb9 chg: 'script run test_t55x7' - better test loops 2019-04-05 08:58:12 +02:00
iceman1001 229452719a chg: compare with low case 2019-04-05 08:36:12 +02:00
iceman1001 a499e30608 chg: 'script run test_t55x7' - more modulations and better wipe card 2019-04-05 08:21:10 +02:00
iceman1001 1a565ae953 fix uninitialised 2019-04-05 07:39:07 +02:00
vratiskol 7f198192ec ReSync file 2019-04-05 04:09:20 +02:00
vratiskol 0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
iceman1001 ad97aa3d29 chg: 'hf iclass sim' - void*, should be uin8_t* 2019-04-05 00:08:36 +02:00
iceman1001 4326d05674 clarify 2019-04-04 23:48:00 +02:00
iceman1001 444c12717c clarify 2019-04-04 23:45:58 +02:00
iceman1001 4d18b5a11c fix: compare unsigned 2019-04-04 22:36:45 +02:00
iceman1001 d127c2294c fix: compare unsigned 2019-04-04 22:35:38 +02:00
iceman1001 419eef5a43 fix: duplicate break 2019-04-04 22:22:31 +02:00
iceman1001 7a152dc383 fix: duplicate break 2019-04-04 22:11:30 +02:00
iceman1001 0dc0a96b3c fix: duplicate break 2019-04-04 22:10:46 +02:00
iceman1001 ff25fc700e fix: duplicate break 2019-04-04 22:09:43 +02:00
iceman1001 cd78a0878b fix: duplicate breaks 2019-04-04 22:08:23 +02:00
iceman1001 116837e9a0 chg: 'lf t55xx info' - text layout 2019-04-04 20:06:15 +02:00
iceman1001 436b026b27 ADD: 'script run test_t55x7' - a script to do regression test for t55xx programming / proxmark3 capability to read/demodulate different t55x7 configurations 2019-04-04 07:21:58 +02:00
vratiskol 6e8b3c29ba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 22:18:39 +02:00
iceman1001 38162917dc Add: new lua scripting support for some t55xx commands. 
core.t55xx_detect()    - same as 'lf t55xx detect'
  core.t55xx_readblock() - read t55xx block, don't forget to run detect before.  Returns actual blockdata.
 2019-04-03 19:48:00 +02:00
iceman1001 c03e425550 chg: 'hf 15 restore' - fail message added 2019-04-03 15:42:42 +02:00
iceman1001 0383d7f052 chg: 'hf mf restore' - add finish message 
chg: 'hf mfu restore' - add finish message
chg: 'hf 15 restore' - add finish message,  close filehandle when failing.
 2019-04-03 15:34:36 +02:00
vratiskol 1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +02:00
Philippe Teuwen 8c74b2f9da Remove compilation warning, even if it was not real issue 
cmdhflegic.c:269:13: warning: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation]
 2019-04-02 22:48:22 +02:00
Philippe Teuwen cbf81cf5c3 remove compilation warning 2019-04-02 22:43:00 +02:00
Philippe Teuwen 64ce30c06c make style 2019-04-02 22:32:45 +02:00
Philippe Teuwen 5225722a50 t55xx info: fix q5 condition 2019-04-02 22:08:50 +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
iceman1001 4c007beefd textual 2019-04-02 10:36:32 +02:00
iceman1001 4eff3521a7 Chg: 'lf t55xx info' - now prints if its a known config block 2019-04-02 10:33:25 +02:00
Philippe Teuwen d448549524 t55xx info: tag out of spec FSKa modulations in standard mode 2019-03-31 21:30:30 +02:00
Philippe Teuwen 045eda93e9 t55xx config: allow to toggle on/off i/q5/st 2019-03-31 19:42:36 +02:00
Philippe Teuwen e88fa75fd0 Revamped t55xx info: support offline block0, Q5, fix extended, add warns etc 2019-03-31 19:06:36 +02:00
Philippe Teuwen 43ca641939 Flasher: Avoid race condition when flasher finds the not yet closed pm3 port 2019-03-31 12:15:49 +02:00
Philippe Teuwen 2080dd396d t55xx detection: remove Atmel as it can be others, see t55xx trace for real manufacturer 2019-03-31 01:18:00 +01:00
Philippe Teuwen 720c410278 Fix lf t55xx trace: read the correct block 2019-03-31 01:13:59 +01:00
Philippe Teuwen 9cec581f1c Makefile: remove WINBINS/WINEXES, ProxSpace doesn't use them 2019-03-29 09:49:42 +01:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
Philippe Teuwen 2ebada74f0 makefile: fix race condition, now we can make -j8 :) 2019-03-27 23:14:19 +01:00
iceman1001 5fd98db92d fix: LF FDX-B demod - more lenient with max errors. Thanks to @maltehillmann 2019-03-27 15:35:43 +01:00
vratiskol a068f7c2bc Mifare Sim 
Compilation OK
Emulation 1k OK with android
 2019-03-27 14:18:26 +01:00
vratiskol ee2dfc0852 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-27 08:00:35 +01:00
vratiskol ffe4a0289f Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 22:28:20 +01:00
mazodude 15fdb07737 Start key file for Mifare Ultralight 2019-03-27 08:21:06 +11:00
iceman1001 069e73d025 preparing for more descramble patterns. 2019-03-26 21:13:57 +01:00
iceman1001 fb665ea7e3 chg: textual 2019-03-26 20:22:39 +01:00
iceman1001 34f4ee4902 whitespace 2019-03-26 20:22:12 +01:00
iceman1001 54e8eafa49 fix: 'lf t55xx chk' 
fix: 'lf t55xx brute'
fix: 'lf t55xx recoverpwd'
 - now works like they should again.
 2019-03-26 20:21:10 +01:00
iceman1001 834832be31 chg 'lf t55xx brute' - AquireData returns isnoise, but a pwd protected card signa looks like noise. 2019-03-26 16:23:19 +01:00
iceman1001 9133a9164f chg: 'lf t55xx chk' - refactored to use loadDictionary 2019-03-26 16:18:40 +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 68fc65a8c5 chg: 32bits binary strings used as default 2019-03-25 14:41:28 +01:00
iceman1001 6bc3ab1e44 chg: some pwd from forum 2019-03-25 14:39:49 +01:00
iceman1001 800bce865d fix: sprint_bin_break doesn't skip bits when newline printing 2019-03-25 14:39:09 +01:00
vratiskol cffb8cbca4 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 00:16:40 +01:00
Philippe Teuwen fe740fabfd cmdlfhid: comment unused struct 2019-03-25 00:04:28 +01:00
Philippe Teuwen 59cf25640f cmdhf14a: Fix usage of sizeof on a uint16_t array 2019-03-24 23:52:00 +01:00
Philippe Teuwen 7936626725 cmdanalyse: use byte arrays 2019-03-24 23:36:45 +01:00
vratiskol 0d5173739c Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-24 22:53:04 +01:00
Philippe Teuwen 9d1aa3fb96 fgpa_compress: dealloc responsibility to main and add missing one 2019-03-24 22:26:49 +01:00
Philippe Teuwen eb3f5e12eb Fix memleak in fpga_compress 2019-03-24 22:20:58 +01:00
Philippe Teuwen 19588b045f Fix realloc mistake: ptr nulled but not freed upon failure 2019-03-24 22:09:25 +01:00
iceman1001 44c3a0a8aa chg: 'lf keri demod' - added stopbits 2019-03-24 19:50:53 +01:00
iceman1001 08dc8ab695 debug 2019-03-23 19:09:37 +01:00
iceman1001 cfb11adeb8 simple check 2019-03-23 19:08:22 +01:00
iceman1001 55b8b8df82 fix: 'lf pyramid demod' - inverted 
chg: checksum colors
 2019-03-23 19:06:52 +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 f42dd2590e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 23:42:00 +01:00
iceman1001 b111b37eb6 offline access 2019-03-20 22:05:29 +01:00
iceman1001 2534d02000 text 2019-03-20 22:04:35 +01:00
vratiskol 28d7b99e1b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 15:59:11 +01:00
iceman1001 3c32fa9f38 color 2019-03-20 12:37:10 +01:00
vratiskol cb895fb8ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 21:15:54 +01:00
iceman1001 8e465d076c chg: use found clock is common 2019-03-19 17:53:42 +01:00
vratiskol 49f0b35ffd Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 16:48:45 +01:00
iceman1001 ab226c2864 detectST has better clock detection. Since 'data raw am' fails but 'data detect a' succeed in finding a clock. Lets see if anything else breaks because of this? 2019-03-19 10:20:10 +01:00
vratiskol 1e20316cee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 02:07:22 +01:00
iceman1001 f79c0075c4 style 2019-03-19 00:12:46 +01:00
iceman1001 e3dbbd3271 style 2019-03-19 00:11:32 +01:00