Commit Graph

10297 Commits

Author SHA1 Message Date
AloneLiberty fae8ffda44 Fix formatting and run make style 2023-03-26 16:12:39 +03:00
AloneLiberty 2c74b98974 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into mf-supercard 2023-03-26 16:05:57 +03:00
iceman1001 97e16ba764 renamed gdm getblk to config since that is what it does 2023-03-26 03:41:12 +02:00
AloneLiberty fc56a51c56 Update changelog 2023-03-25 18:07:52 +03:00
iceman1001 7b93de7a81 added GDM read configuration block 2023-03-25 15:00:58 +01:00
AloneLiberty b903d0bbe2 Supercard keys recovery from second generation card 2023-03-25 02:15:07 +03:00
AloneLiberty 2661a2a034 Supercard UID changing from backdoor command 2023-03-25 02:05:47 +03:00
Self Not Found 368bf57661 Fix the example of msleep 2023-03-24 18:44:28 +08:00
iceman1001 693b6487fb changed 14a / mifare annotations to more easily see block numbers involved 2023-03-23 08:10:02 +01:00
iceman1001 aa05e2eeae textual and cleanup 2023-03-21 20:55:57 +01:00
iceman1001 e1d90b3de2 annotate the GDM magic write 2023-03-21 19:58:31 +01:00
iceman1001 07f6162780 added support for the magic card called GDM. 2023-03-21 19:49:52 +01:00
Iceman 48d9503a5b Merge pull request #1943 from 0xdeb/legic_info
Legic info command for other sources, out of bounds memory
2023-03-19 18:37:10 +01:00
iceman1001 9399d4e400 fix hex 2 binstring functions 2023-03-19 12:49:38 +01:00
iceman1001 23926a7a14 fix leading zero call 2023-03-19 12:48:47 +01:00
iceman1001 69e43b362e fix asn1 parsing of dates 2023-03-19 12:47:24 +01:00
Fabian Schneebauer fb46e8bae7 Merge functionality of view and dinfo. 2023-03-16 20:38:13 +01:00
Fabian Schneebauer 03f6ad02f3 legic: info command available for more sources, add memory check. 2023-03-16 17:01:57 +01:00
iceman1001 1cc19c3429 asn1 decoder now handles big integers 2023-03-13 22:09:30 +01:00
iceman1001 04173fc961 added bit string printing in ASN1 decoder 2023-03-13 21:36:59 +01:00
iceman1001 d11d1fbc33 data asn1 now decodes timestamp correct... Or I hope so. And strings values are now highlighted with GREEN 2023-03-12 19:18:55 +01:00
iceman1001 4a7713070b fix object strings. Integers is now 64b which isnt enough. Will need to use big_num here 2023-03-12 18:59:53 +01:00
iceman1001 5938938226 print the string and hex 2023-03-12 18:54:53 +01:00
iceman1001 d02e8daba0 Changed CLI max string argument length limit from 512 to 4096. data asn1 now handles 2048 hex bytes input 2023-03-12 09:53:23 +01:00
Christian Herrmann 2e8bacb00f Fixed data asn1 - now handles bad input better by doing correct root free of obj 2023-03-11 18:59:33 +01:00
iceman1001 906e3f4c32 added pk for signature verification 2023-03-11 12:07:31 +01:00
iceman1001 70f47aa93e added a new public key found for MIFARE Plus troika cards 2023-03-11 12:02:51 +01:00
Iceman 1b9841cc6e Merge branch 'master' into master
Signed-off-by: Iceman <iceman@iuse.se>
2023-03-11 07:53:52 +01:00
wh201906 adcfab2775 Fix hardnested.cmake 2023-03-11 00:47:24 +08:00
wh201906 0f206ccef4 Fix client build on Android
Tested with:
cmake 3.10.2.4988404/3.24.1
ndk 25.2.9519653

Build command:

cmake \
    -DCMAKE_TOOLCHAIN_FILE=/home/gitpod/androidsdk/ndk/25.2.9519653/build/cmake/android.toolchain.cmake \
    -DANDROID_ABI=armeabi-v7a \
    -DANDROID_NATIVE_API_LEVEL=android-19 \
    -DSKIPBT=1 -DSKIPPYTHON=1 -DSKIPPTHREAD=1

(armeabi-v7a, arm64-v8a, x86 and x86_64 are all tested)
2023-03-11 00:27:48 +08:00
GuruSteve 917b37178e Updated verbiage WRT KeyAccess to make it clearer 2023-03-09 16:34:50 -07:00
astrid rowland f56e066e50 accidentally a typo, thanks vim 2023-03-08 13:24:12 -06:00
astrid rowland 68c74fd3ae removed unconfirmed unleashed keys 2023-03-08 13:14:20 -06:00
astrid rowland adefd302f5 cleaned up original patch (same keys), added new keys from The Horde 2023-03-08 12:53:43 -06:00
Self Not Found dba8d811fd Link ws2_32 2023-03-06 22:05:41 +08:00
wh201906 0f70df5de3 Add TCP connection support on Windows
The Windows Sockets 2 API is similar to the BSD Sockets API,
so I can reuse a lot of code in uart_posix.c
2023-03-06 19:55:41 +08:00
iceman1001 7abfff4095 moved and unified some reverse array fct 2023-03-05 19:19:15 +01:00
Iceman 32a06758bb Merge pull request #1931 from chl337/master
HF15: Write / Read  when is UID is passed as argument
2023-03-05 08:38:30 +01:00
iceman1001 bd99523edc style 2023-03-05 08:22:21 +01:00
iceman1001 7584a7a617 style 2023-03-05 08:22:01 +01:00
iceman1001 47908df32e more text changes to hf tesla info 2023-03-05 08:21:09 +01:00
iceman1001 37ecae658f added data num command. Takes dec or hex or binary and convert between them. Uses big_int so no issue with hex -> dec limits. It also does a Prime number check, where it will a line in the case of a number happens to be prime. 2023-03-05 08:20:10 +01:00
iceman1001 514626a0ab init array 2023-03-04 21:26:12 +01:00
iceman1001 855f13d763 string formatter 2023-03-04 21:25:44 +01:00
iceman1001 c6a8f8cc89 fix test 2023-03-04 21:25:23 +01:00
iceman1001 aebbdaea2d fix CID #405223 - use after free, all callers must handle bad returns properly 2023-03-04 20:36:28 +01:00
iceman1001 f9da8615e4 fix CID #405224 2023-03-04 20:32:34 +01:00
iceman1001 7504413f0b fix CID #405225 2023-03-04 20:29:39 +01:00
iceman1001 b6be8d9532 fix CID # 405226 2023-03-04 20:24:20 +01:00
iceman1001 a0feb580c2 fix CID #405227 - wrong comparision for the first fix 2023-03-04 20:20:10 +01:00