Commit Graph
11972 Commits
Author SHA1 Message Date
Antiklesys 49524575be Update legbrute for even threads
Updated legbrute to use an even number of threads and display the starting key of every key block. Useful in case the operation needs to be halted and resumed
2024-09-17 01:32:44 +08:00
douniwan5788 e5c0007f0b refactor: move concatbits() to commonutil 2024-09-17 01:00:32 +08:00
iceman1001 805dc99b97 lf search - now tries to read out hitag2 data with the paxton key. 2024-09-15 18:19:28 +02:00
Iceman c9531ae62b Merge pull request #2510 from douniwan5788/fix_uid
Fix Hitag S get uid
2024-09-15 17:45:48 +02:00
iceman1001 32058894ea style 2024-09-15 13:16:35 +02:00
iceman1001 3ea655c86d text 2024-09-15 11:43:05 +02:00
douniwan5788 662b194e56 refactor: hitag S code sytle & cleanup 2024-09-15 12:56:51 +08:00
iceman1001 febaa64b4d make all device side HTS messages DBGlevel extended 2024-09-14 22:00:52 +02:00
iceman1001 d715871df8 ....fix type 2024-09-14 21:07:15 +02:00
iceman1001 d1029ce281 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-09-14 21:05:19 +02:00
iceman1001 db1b28f327 rename hts read/write commands to rdbl/wrbl to match rest of the client. added a lf hitag hts reader comamnd, modified the lf search to identify hitag2/s/82xx in the chipset detection 2024-09-14 21:00:42 +02:00
Iceman 395d16c741 Merge pull request #2509 from douniwan5788/0em410
fix: all zeros is a valid Em410x too
2024-09-14 18:40:48 +02:00
iceman1001 dd32fceb54 support function 2024-09-14 18:38:28 +02:00
iceman1001 34e00146c6 change data available check in hf mf sim on device side. 2024-09-14 18:37:56 +02:00
douniwan5788 8609322871 fix: all zeros is a valid Em410x too 2024-09-14 23:49:46 +08:00
iceman1001 20a0bc3a81 style 2024-09-14 15:03:29 +02:00
iceman1001 9ebe5ae8dd text 2024-09-14 14:55:23 +02:00
iceman1001 a636d97551 remove non informative message 2024-09-14 14:24:03 +02:00
iceman1001 fc17873e1d fix xpression compared to zero 2024-09-14 14:22:25 +02:00
iceman1001 ec33873738 fix wrong type 2024-09-14 14:20:34 +02:00
iceman1001 8f9ca98f6c fix narrow type .. 2024-09-14 14:19:20 +02:00
iceman1001 4af367f66f fix ats 2024-09-14 14:16:36 +02:00
iceman1001 0fe568970b style 2024-09-13 13:44:16 +02:00
iceman1001 77e94c8047 use DEFINES instead 2024-09-13 13:43:32 +02:00
iceman1001 65cf65dc96 ATS printing can be an issue since some magic cards doesnt treat ATS properly. This will lessen the garbage output 2024-09-13 13:42:34 +02:00
Iceman c6f98036d5 Merge pull request #2508 from douniwan5788/cmdread
fix: `lf cmdread` silent lost CRC
2024-09-13 13:28:23 +02:00
Iceman 1853d557ed Merge pull request #2507 from douniwan5788/hitag_names
style: Hitag names
2024-09-13 13:26:13 +02:00
douniwan5788 424a467132 fix: lf cmdread silent lost CRC 2024-09-13 19:15:11 +08:00
douniwan5788 375eb612e8 style: Hitag names 2024-09-13 17:15:37 +08:00
douniwan5788 0c7964084c feat: Added lf em 410x clone --hts clone EM410x ID to 8268/8310 2024-09-13 17:06:15 +08:00
douniwan5788 3860942e55 feat: Added support for 8268/8310 2024-09-13 17:06:15 +08:00
Adam Jon Foster e2c2b9cc9f Rename trace_parse to trace_parse.lua
Fixed file extension

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-12 16:29:32 +08:00
Adam Jon Foster bbcd2d35d9 Create trace_parse
Created a Trace Parser Library to just have something to allow for lua scripts to be able to read .TRACE structured files. 

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-12 16:29:05 +08:00
Ikko Eltociear Ashimine ec6b3981b5 chore: update hf_ntag_bruteforce.lua
Faild -> Failed

Signed-off-by: Ikko Eltociear Ashimine <eltociear@gmail.com>
2024-09-12 01:23:31 +09:00
Iceman 47d94f4688 Merge pull request #2488 from douniwan5788/mifare_info
Mifare info
2024-09-11 15:41:20 +02:00
iceman1001 a18ec2b54e the string params for scripting was limited to 256 chars, this has been increased to 1024 chars, allowing for 512 hex bytes to be read. remember spaces will count as a char when using the quotes. Also increased file name array to match the rest of the pm3 client length. 2024-09-11 12:08:28 +02:00
iceman1001 781bde832c logical... logical 2024-09-10 22:51:50 +02:00
iceman1001 4c73863496 added another hint 2024-09-10 21:33:21 +02:00
iceman1001 d9a5445c02 check def pwd 2024-09-10 21:29:07 +02:00
iceman1001 5f22292bba text 2024-09-10 21:22:17 +02:00
iceman1001 81e154517b style 2024-09-10 21:10:29 +02:00
iceman1001 242ddf8e30 added fudan ntag 215 clone. 2024-09-10 21:09:32 +02:00
iceman1001 30c16b8f8f fix #2457 - when testing cards which doesnt answer to GET_VERSION command we try to assume which card it is by looking if it can read a block or not 2024-09-10 20:25:43 +02:00
iceman1001 a4edfd1b7c identify a magic ntag 215, new model, thanks @KCSEC (@iceman1001). -v param is for verbose mode 2024-09-10 19:50:12 +02:00
iceman1001 b881bbbd00 Revert "Release v4.18994 - Backdoor"
This reverts commit cd6dc880ad.
2024-09-10 15:40:28 +02:00
iceman1001 cd6dc880ad Release v4.18994 - Backdoor 2024-09-10 15:40:28 +02:00
iceman1001 ba8a68f37c fixes entering bootload messages to be less scary 2024-09-10 14:29:47 +02:00
Philippe Teuwen 0a22929eac Fix buffer overflow
Strangely only detected by Ubuntu 18.4 gcc 7.5.0

```
[-] CC src/cmdhflist.c
In file included from /usr/include/string.h:494:0,
                 from src/cmdhfict.c:21:
In function 'memcpy',
    inlined from 'diversify_mifare_key' at src/cmdhfict.c:151:5,
    inlined from 'derive_mifare_key' at src/cmdhfict.c:189:5,
    inlined from 'CmdHfIctReader' at src/cmdhfict.c:199:12:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:34:10: error: '__builtin___memcpy_chk' writing 8 bytes into a region of size 6 overflows the destination [-Werror=stringop-overflow=]
   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'memcpy',
    inlined from 'diversify_mifare_key' at src/cmdhfict.c:151:5,
    inlined from 'derive_mifare_key' at src/cmdhfict.c:189:5,
    inlined from 'CmdHfIctReader' at src/cmdhfict.c:203:12:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:34:10: error: '__builtin___memcpy_chk' writing 8 bytes into a region of size 6 overflows the destination [-Werror=stringop-overflow=]
   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```

```c
    uint8_t diverse[MIFARE_KEY_SIZE]; // = 6
    diversify_mifare_key(uid, diverse);
```

```c
static int diversify_mifare_key(const uint8_t *uid, uint8_t *app_key) {
...
    uint8_t output[8];
...
    memcpy(app_key, output, sizeof(output));
```
2024-09-10 09:02:46 +02:00
Philippe Teuwen 13cad28d2a fix experimental_client_with_swig cmake tests 2024-09-10 00:09:55 +02:00
Philippe Teuwen b91f7742c1 fix experimental_lib/example_c/test_grab: no fork&pipe needed, use pm3_grabbed_output_get 2024-09-09 23:57:32 +02:00