Commit Graph
5493 Commits
Author SHA1 Message Date
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
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
Antiklesys 3253e2c288 Reverted buggy changes to hf iclass dump
Reverted code back to the original as it would "read" a card's AA1 without the correct keys.
2024-09-09 22:46:49 +08:00
Antiklesys 8e961aaa04 Re-fixed indent 2024-09-09 18:01:02 +08:00
Antiklesys 96b1b6d72c Fixed indent
Fixed indent
2024-09-09 17:58:47 +08:00
Antiklesys 041f6244cb Fixed AA2 dump with Kc only
Fixed issue preventing iclass dump to dump AA2 only when only using Kc
2024-09-09 17:54:57 +08:00
douniwan5788 b834fbf00d refactor: mifare info 2024-09-08 23:07:35 +08:00
douniwan5788 131f4ac64a refactor: Don't decrease the user setup debug level. 2024-09-08 23:06:39 +08:00
iceman1001 dd9bc4d363 the select param was handled wrong and it was tested for CRC which will not work. Thanks @RebornBrain for suggesting a fix 2024-09-08 14:25:40 +02:00
Philippe Teuwen 69d7a7e0c3 fm11rf08s: get advanced verification sector keys as well 2024-09-08 11:57:53 +02:00
Philippe Teuwen 846b273583 add fm1208-10 to hf 14a info 2024-09-08 09:58:30 +02:00
iceman1001 e50459b2c5 style 2024-09-06 22:59:23 +02:00
iceman1001 72900d1bf9 fix and style 2024-09-06 22:36:44 +02:00
iceman1001 996429fa9e fix some const params 2024-09-06 10:13:02 +02:00
iceman1001 7549f53b63 we use calloc 2024-09-06 10:07:06 +02:00
iceman1001 076bfb2ec5 fix consts 2024-09-06 09:31:07 +02:00
iceman1001 cfd218dd6f fix bad return value 2024-09-06 09:22:38 +02:00
Iceman b77099e195 Merge pull request #2490 from douniwan5788/fix_exit
fix: exit status
2024-09-06 08:53:46 +02:00
Philippe Teuwen 46a8bea230 hf mf info: FM11RF32 detection 2024-09-05 15:32:52 +02:00
douniwan5788 9b879b0dc0 fix: exit status 2024-09-05 19:31:37 +08:00
Marcel Barbulescu 1d5dec3ed3 fix help on lf hitag hts read and lf hitag hts write commands 2024-09-04 20:51:59 -04:00
douniwan5788 740ab6bb33 fix: mfDarkside hangs 2024-09-04 23:28:13 +08:00
douniwan5788 5e9533a792 refactor: mfDarkside error code 2024-09-04 23:28:13 +08:00