Commit Graph

19029 Commits

Author SHA1 Message Date
iceman1001 ccf8d8b754 fix #2501 the parallel execution of "make -j check" created a race condition in the static nonces tests. 2024-09-13 13:37:27 +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 9509990590 Merge pull request #2506 from douniwan5788/82xx_doc
doc: update 82xx
2024-09-13 13:27:36 +02:00
Iceman 1853d557ed Merge pull request #2507 from douniwan5788/hitag_names
style: Hitag names
2024-09-13 13:26:13 +02:00
Iceman 3e4f1576c4 Merge pull request #2505 from douniwan5788/8268
Added support for 8268/8310
2024-09-13 13:25:49 +02:00
douniwan5788 424a467132 fix: lf cmdread silent lost CRC 2024-09-13 19:15:11 +08:00
douniwan5788 1358a54019 doc: update 82xx 2024-09-13 17:16:01 +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 edb74d084e Merge pull request #2503 from elboulangero/fix-readme-location
mkversion: Fix readme location
2024-09-13 08:37:56 +02:00
Arnaud Rebillout 09bcc13f2b mkversion: Fix readme location
While building proxmark3 in an environment without `git` installed, I
noticed the following errors on stderr:

```
mkversion create test                   env: 'git': No such file or directory
stat: cannot statx '../README.md': No such file or directory
```

The first line "env: 'git': No such file or directory" is expected, as
git is not installed.

However, the second line "stat: cannot statx '../README.md': No such
file or directory" is a real error: we're running from top-level
directory, so the correct path for README.md is just "README.md".
2024-09-13 10:44:39 +07:00
Iceman 89ec45354e Merge pull request #2502 from evildaemond/master
Simple Trace Parsing LUA Library
2024-09-12 11:21:04 +02: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
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