Commit Graph
19015 Commits
Author SHA1 Message Date
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
Philippe Teuwen 5a95eb63df Merge pull request #2499 from ZeroChaos-/master
add opencl support to CheckFileExist()
2024-09-12 00:02:27 +02:00
Rick Farina (Zero_Chaos) cd90af34a0 add opencl support to CheckFileExist()
CheckExecute() has a flag to tell it if a check needs opencl support or
not and can automatically disable the check if opencl checks are not
requested.  Mostly copy and paste the same feature into CheckFileExist
and add it where needed.
2024-09-11 16:21:29 -04:00
Iceman 9a77b3f5f8 Merge pull request #2498 from eltociear/patch-1
chore: update hf_ntag_bruteforce.lua
2024-09-11 19:05:12 +02: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 8571757e0f text 2024-09-10 15:41:16 +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 v4.18994 2024-09-10 15:40:28 +02:00
iceman1001 85ccccdce6 fix missing gitignore 2024-09-10 15:33:26 +02:00
iceman1001 ba8a68f37c fixes entering bootload messages to be less scary 2024-09-10 14:29:47 +02:00
Philippe Teuwen 16b56f4992 Fix opensuse instructions 2024-09-10 10:06:01 +02:00
Philippe Teuwen cd17ee7ba2 Fix Opensuse Leap 15.6 Dockerfile 2024-09-10 09:53:52 +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 a907e93d19 fix parrot dockerfile 2024-09-10 01:17:48 +02:00
Philippe Teuwen cb473b6238 fix opensuse-leap docker 2024-09-10 01:16:55 +02:00
Philippe Teuwen 8cf66420af add gd to all Dockerfiles due to changes in hf waveshare 2024-09-10 00:59:14 +02:00
Philippe Teuwen fd1d088099 Fix Dockerfiles deprecation warning 2024-09-10 00:14:37 +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
Philippe Teuwen 1fa84f203d fix hf_colin compilation error 2024-09-09 23:43:01 +02:00
Philippe Teuwen ce650f472f remove tabs 2024-09-09 23:04:39 +02:00
Iceman a47ed1c7a7 Merge pull request #2493 from Antiklesys/master
Reverted changes to hf iclass dump due to buggy behavior
2024-09-09 21:01:14 +02:00
Antiklesys 1978c56f9d Merge branch 'RfidResearchGroup:master' into master 2024-09-09 22:47:48 +08: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
Iceman 23f1089e4b Merge pull request #2492 from Antiklesys/master
Fixed AA2 dump with Kc only
2024-09-09 12:59:33 +02:00
Antiklesys c7c56c41b9 Update CHANGELOG.md 2024-09-09 18:10:13 +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
douniwan5788 29f9862cf1 refactor: iso14443a_fast_select_card 2024-09-08 23:04:57 +08:00
Philippe Teuwen 157af8c31b fm11rf08s script check python version 2024-09-08 15:16:23 +02: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
Philippe Teuwen 2dd1b90f4c hf mf sim: adapt RATS condition to mimick real MFP 2k behavior 2024-09-07 11:10:31 +02:00
Philippe Teuwen 358130505a hf mf sim: accept RATS no matter the value of PCD FSDI & CID 2024-09-07 11:01:58 +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