RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
16893 commits 3 branches 14 tags 85 MiB
Commit graph

10601 commits

Author SHA1 Message Date
berlin4apk c13632a980 New keys 2023-05-25 20:19:59 +02:00
iceman1001 7b92c00827 hide false positive in CMAKE on MINGW 2023-05-25 07:58:43 +02:00
iceman1001 9ee7bd2936 adjust potential type conversion 2023-05-25 07:15:43 +02:00
Angel 4dc8d5316a Make Style 2023-05-24 21:54:42 -04:00
Angel ef74541b28
Merge branch 'RfidResearchGroup:master' into master 2023-05-24 21:47:02 -04:00
Angel 832afcd0d4 Fix help menu format 2023-05-24 20:45:51 -04:00
iceman1001 1b67921086 renaming and making sure N never is a strange number 2023-05-24 17:19:34 +02:00
iceman1001 37e5540aab fixed a logic error. param N is used as total number of blocks. I is using it as zero based index... 2023-05-24 15:43:44 +02:00
iceman1001 5e3710c232 rearranged for easier testing 2023-05-24 14:02:54 +02:00
iceman1001 2103d695f8 maur keys 2023-05-24 09:13:01 +02:00
iceman1001 e3f4012d78 maybe proxspace gets happier 2023-05-24 08:07:35 +02:00
iceman1001 74bb64f316 formatting 2023-05-24 07:01:33 +02:00
Óscar Alfonso Díaz 6a8bb34eac
Merge branch 'master' into master 
Signed-off-by: Óscar Alfonso Díaz <oscar.alfonso.diaz@gmail.com>
 2023-05-23 13:11:37 +02:00
iceman1001 03e1b23fb0 fixes #1986. spelling 2023-05-23 13:05:29 +02:00
Iceman 3c3de8d0c4
Merge pull request #1992 from wh201906/restore 
Auth both key A and key B with default password in `hf mf restore`
 2023-05-23 12:41:42 +02:00
Iceman 5f424a9afc
Merge pull request #1989 from corysolovewicz/patch-2 
Create update_amiibo_tools_lua.py
 2023-05-23 12:39:09 +02:00
Self Not Found ca6e9e4ba9
Auth both key A and key B in hf mf restore 2023-05-21 10:07:17 +08:00
OscarAkaElvis f9deb75b3d
Add python3 script to convert amiibo nfc Flipper Zero files to eml files to be used with Proxmark3 2023-05-20 00:00:55 +02:00
Cory Solovewicz 3939bcb541
Create update_amiibo_tools_lua.py 
This is a python script to automate what the updating of the amiibo_tools.lua
file which holds a lua table of all known amiibos. Previously updating the 
amiibo_tools.lua was a very manual process and prone to errors. This simplifies the process. 

Signed-off-by: Cory Solovewicz <cory@solovewicz.com>
 2023-05-18 09:35:09 -07:00
Cory Solovewicz eae5da6b22
Update amiibo_tools.lua 
Update Lua Table with new entries. 

Signed-off-by: Cory Solovewicz <cory@solovewicz.com>
 2023-05-18 00:15:55 -07:00
dash cb0a3257be fix reading NDEF from Mifare Classic 2023-05-10 00:33:15 +03:00
iceman1001 fcc922259f fix output when printing 0,1 numbers like in nested, view commands. Bonus, added NDEF key detection to give hint 2023-05-08 20:36:23 +02:00
PhaseLoop 19d7851c73 run "make style" 2023-05-08 17:08:24 +00:00
phaseloop f09a8cfa28 add bruteforce parameters to command line 2023-05-06 14:47:45 +00:00
phaseloop 85f1785ccb initial bruteforce module 2023-05-06 14:47:31 +00:00
iceman1001 149cc025ce style 2023-05-06 14:38:14 +02:00
iceman1001 d91b576034 style 2023-05-06 14:37:47 +02:00
iceman1001 0224816208 refactoring the return value of function 2023-05-06 14:31:19 +02:00
iceman1001 a3fa6c3df5 fixed ACL when recoving keys from SIM 2023-05-06 14:13:44 +02:00
iceman1001 31b01fff5a clearning variable before each call to hardnested 2023-05-06 06:55:10 +02:00
iceman1001 27576be5c2 trying to extract ndef data from dumps by looking at MAD 2023-05-05 22:26:44 +02:00
iceman1001 cb0a447600 bt handover req/select and reverse BT MAC 2023-05-05 22:24:53 +02:00
iceman1001 3b68acd286 comment out duplicate but kept it since documentation 2023-05-05 19:37:35 +02:00
Iceman 5eda7c3252
Merge pull request #1966 from colonelborkmundus/master 
Add new mfc keys
 2023-05-05 19:39:11 +02:00
iceman1001 78f097cb55 the nfc decode now handling MFC dump files, it detects the MAD key and if so removes all sector trailers. this means a lot of zeros in the end might be there. And ndef prints a bunch of empty records. Better than before atleast 2023-05-05 13:20:52 +02:00
iceman1001 ed555be180 fix wrong copying when skipping sector trailers 2023-05-05 13:18:53 +02:00
iceman1001 3e293b4bc8 changed nfc decode to handle external records and if the record happens to be estonian ekaart also ASN1 decode it 2023-05-05 12:33:14 +02:00
iceman1001 52981476e2 fixed ndef parsing of signature version 1 records 2023-05-05 10:47:02 +02:00
Iceman bf897786f2
Merge pull request #1976 from natmchugh/master 
Add paxton id to hitag2 info
 2023-05-04 07:59:47 +02:00
Nat McHugh f1aedc6bce Add paxton id to hitg2 info 2023-05-03 13:17:20 +01:00
Maksym f9ea12b98d
Update aidlist.json 
Replace "rid" with prefix as it is more correct this way
 2023-05-03 00:48:21 +03:00
kormax 2678c8e1a4 Add more AID entries 2023-05-02 22:04:40 +03:00
Mistial Developer 9eca7fce83
Add text explaining that the format is H10301 for binary, and specifying it for non-binary 2023-04-28 00:09:24 -05:00
iceman1001 d480cbd1d0 hf 14b dump now supports the no save parameter 2023-04-26 00:10:15 +02:00
iceman1001 94b0bcc758 changed the key table output. In some cases it didnt print non found keys red 2023-04-26 00:08:01 +02:00
iceman1001 6fe3263576 hf mfu dump now supports the --ns param to not save the memory dump to file 2023-04-26 00:06:55 +02:00
iceman1001 e252668866 style 2023-04-23 11:32:59 +02:00
iceman1001 fe31bd4064 cleaning out memory unsafe functions for loading files. Also made the loading of files to honor the preference dump/trace settings. Experimental support, which will need more love. I have been using it for some months now but there are still other save/load file operations scattered in the PM3 client which will not benefit from this yet. They need to be adapted too 2023-04-23 11:32:32 +02:00
iceman1001 039937e28a added the possibility to load .MCT dump files in the client. MCT format is a textual one like EML but with extra descriptive lines of text before each sector 2023-04-23 11:27:12 +02:00
Philippe Teuwen 3bc472c9bb hf mf cwipe: use same default ACL as for hf mf wipe 2023-04-17 23:22:48 +02:00
iceman1001 1a3a6e5f19 added no save to t55xx dump. and some minor text output style 2023-04-17 20:12:03 +02:00
Angel 207e5bbc53 Final cleanup 2023-04-16 14:29:58 -04:00
iceman1001 03070778a2 mfp chk - allow for breaking out at every attempt 2023-04-16 05:58:34 +02:00
Angel 98438c8dd7 Remove redundant comment. 2023-04-15 23:26:34 -04:00
Angel 5192c5f5d5 Added ability to emulate paradox tag. 2023-04-15 23:20:48 -04:00
Angel 8841991b29 Add check for max fc and cn, changed types to match rest of file 2023-04-15 22:42:03 -04:00
Angel 76e3f38772 Add check to make sure user did not specify Raw and cn/fc 2023-04-15 22:26:09 -04:00
Angel ab460c4a22 Extract bitstream creation to function. 2023-04-15 22:25:20 -04:00
Angel 0a66f809a6 Removed deprecated CRC calculation 2023-04-15 22:23:06 -04:00
Self Not Found ba3d5c32ae
Fix logic 2023-04-16 09:51:07 +08:00
iceman1001 1bb78e02a4 fix MFP check with defines and easier logic 2023-04-15 20:44:52 +02:00
Iceman 1f1c1d1458
Merge pull request #1961 from team-orangeBlue/master 
Add some magic cards notes, fix `hf mfp chk`
 2023-04-15 20:38:13 +02:00
astrid rowland 17aa99b0c7 added new keys from The Horde, badges 76-94 2023-04-13 17:44:55 -05:00
astrid rowland f022a8f96e added new keys from The Horde 2023-04-13 14:44:03 -05:00
PiervitoCreanza 62fb634fdb
Fix wrong variable assignment 2023-04-13 20:29:15 +02:00
Anže Jenšterle a78cc42230
Added Siemens Default key 
Signed-off-by: Anže Jenšterle <anze@anze.dev>
 2023-04-12 13:31:54 +02:00
team-orangeBlue 022c06c596
Fix a bug 
I can't code

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-04-11 19:14:55 +03:00
team-orangeBlue 364c047503
Merge branch 'RfidResearchGroup:master' into master 2023-04-11 17:49:32 +03:00
iceman1001 05a0fa7f3f added some keys from discord 2023-04-10 20:04:31 +02:00
Iceman 1897701918
Merge pull request #1950 from orensbruli/patch-1 
New keys added to mfc default
 2023-04-10 19:57:56 +02:00
Iceman f12f5da44b
Merge pull request #1958 from Alejandro12120/gen4-update 
`hf_mf_ultimatecard.lua` now supports 10 bytes uid + documentation fixes
 2023-04-09 19:19:11 +02:00
Alejandro be7ab51df5
update documentation x2 2023-04-09 19:04:36 +02:00
iceman1001 e68123a15a remove dups 2023-04-09 18:47:12 +02:00
iceman1001 5b93326683 remove dups 2023-04-09 18:36:45 +02:00
Alejandro c9cab37766
Updated hf_ultimatecard.lua 2023-04-09 15:13:12 +02:00
iceman1001 ee7c68dc41 remove duplicates 2023-04-09 12:30:05 +02:00
team-orangeBlue fd9c8f4f7e
Small corrections to MF+ commands 
Add -k argument to rdbl, fix chk command

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-04-09 08:52:52 +03:00
Esteban Martinena Guerrero 7ebc1c85f1
No new line at the end 2023-04-08 18:16:33 +02:00
Esteban Martinena Guerrero e4cf3aa7f9
Fixinf dups 2023-04-08 18:15:11 +02:00
iceman1001 f65d7cbed9 added some more color to the key table output. Should be clear which keys failed now 2023-04-08 11:15:19 +02:00
iceman1001 d9035737af style.. 2023-04-08 11:03:11 +02:00
iceman1001 04f9850b1b added the possibility to abort the dumping of mifare card clientside 2023-04-08 09:52:17 +02:00
iceman1001 7b6ca6d50f Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-04-08 09:05:13 +02:00
iceman1001 52f432a967 fix memory alloc in hf mf rdsc, when sector was larger than 32 2023-04-08 09:03:32 +02:00
Esteban Martinena Guerrero 1683fc53ee
Merge branch 'master' into patch-1 
Signed-off-by: Esteban Martinena Guerrero <orensbruli@gmail.com>
 2023-04-07 11:20:30 +02:00
Iceman dc24c4b6ac
Merge pull request #1956 from wh201906/unit 
Fix units
 2023-04-07 10:56:02 +02:00
iceman1001 82fe8dbe36 fix some coverity findings 2023-04-06 19:32:07 +02:00
Self Not Found d33fbf1347
Fix units 2023-04-06 20:54:00 +08:00
AloneLiberty 2b248e03e8
Merge branch 'master' into mf-supercard 
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
 2023-04-03 21:45:32 +00:00
Iceman 83cab74f24
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-04-01 21:34:20 +02:00
AloneLiberty 3524306bf4 Implement transfer to other block in hf mf value 2023-04-01 20:49:15 +03:00
AloneLiberty ac5dd0ffa8
Merge branch 'master' into mf-supercard 
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
 2023-04-01 16:42:02 +00:00
iceman1001 222ef4e084 addded static encrypted nonce checks to nested 2023-04-01 12:24:32 +02:00
iceman1001 4d28c852ac extracted load keys and mfc tag memory based on @didierA and @alejandro12120 PR. 2023-03-30 22:40:26 +02:00
iceman1001 dab3171ba6 added loadbinarykeys fct which takes fn and loads binary MFC keys into two arrays KeyA, KeyB. 2023-03-30 22:38:03 +02:00
GuruSteve ee79e5acb7 Added default iClass credit key to table; reorganized key order 2023-03-29 15:44:52 -06:00
Esteban Martinena Guerrero 71293fa2b2
New keys 2023-03-29 08:42:13 +02:00
AloneLiberty d10d8c0039 And make style 2023-03-26 18:05:11 +03:00
AloneLiberty 9a4c363549 Leading zeros in key 2023-03-26 18:03:46 +03:00
AloneLiberty f3a3707c06
Merge branch 'master' into mf-supercard 
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
 2023-03-26 14:58:33 +00:00
iceman1001 71ddee1386 added "hf mf gdmsetcfg" to write GDM configuration 2023-03-26 16:50:59 +02:00
AloneLiberty d434eeae60 Supercard gen1/gen2 detection in MifareCIdent 2023-03-26 17:50:17 +03:00
AloneLiberty fade240031 Fix formatting and run make style 2023-03-26 16:16:03 +03:00
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 82f5c8512d mfc writes now support tear off 2023-03-26 13:58:27 +02: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
iceman1001 95a19405d8 fix CID #405230 - array too small 2023-03-04 20:17:06 +01:00
iceman1001 173841b533 fix CID #405231 - resource leak 2023-03-04 20:14:09 +01:00
iceman1001 b3652c28be fixc CID #405232 - init array 2023-03-04 20:12:00 +01:00
iceman1001 8f20eed914 fix CID #405232 2023-03-04 20:10:46 +01:00
iceman1001 060f452530 fix text 2023-03-04 20:03:53 +01:00
Iceman 5cf0bf7620
Merge pull request #1928 from cha0tic87/master 
Adding bruteforcing functionality to HID facility code
 2023-03-04 19:17:31 +01:00
Chris Smith f424667d0c
Fix syntax 2023-03-04 10:40:19 -07:00
DidierA d319b0dee3 hf mfdes: Use hex in error message, consistent with cmdline 2023-03-03 16:03:30 +01:00
DidierA 13e43b1eb5 hf mfdes: Examples where using -s instead of --schann 2023-03-03 15:57:35 +01:00
ch3lt db7598ff6b Merge remote-tracking branch 'origin' 2023-03-01 11:57:25 +01:00
weejhsteve 194895e9af
Update mfc_default_keys.dic 
Tidying up. forgot leave a blank comment line.

Signed-off-by: weejhsteve <92703857+weejhsteve@users.noreply.github.com>
 2023-03-01 15:48:22 +08:00
weejhsteve b486f3bba4
Update mfc_default_keys.dic 
# Food GEM
6686FADE5566

Signed-off-by: weejhsteve <92703857+weejhsteve@users.noreply.github.com>
 2023-03-01 11:23:14 +08:00
Chris Smith cd5fa61683
Update help text 2023-02-28 07:28:06 -07:00
Chris Smith 3bcac0cc64
Updated arguments and help text 2023-02-28 07:24:24 -07:00
Chris Smith 21a1defa88
Fix formatting 2023-02-27 13:06:38 -07:00
Chris Smith 702716b597
Fix formatting 2023-02-27 13:05:16 -07:00
Chris Smith 85ca342567
Add bruteforce functionality to HID facility code 2023-02-27 13:02:16 -07:00
Augusto Zanellato 7834db8be7 Add CHANGELOG.md entry, bump script version 2023-02-26 15:45:28 +01:00
Augusto Zanellato b05a2d4525 Add mfc signature support to gen4 lua script 2023-02-26 15:45:28 +01:00
iceman1001 dd7c9daa8d fix CID #405002 - invalid string formatter 2023-02-23 20:53:53 +01:00
Iceman 5689d95301
Merge pull request #1896 from GuruSteve/gProxII-XOR 
Added XOR key extraction and flag to Guardall G-Prox II
 2023-02-23 12:34:49 +01:00
Matthew Jackson 75fd0c2034
fixed another missing CLIParserFree(ctx); 
Signed-off-by: Matthew Jackson <123390480+mjaksn@users.noreply.github.com>
 2023-02-23 01:52:07 -06:00
Matthew Jackson 690eb0fc8a add missing CLIParserFree(ctx) , init variable to zero, and small text change 2023-02-22 07:40:04 -06:00
Matthew Jackson 23e0268a1a Merge branch 'master' into 213TT 2023-02-22 07:34:05 -06:00
ch3lt a39b474884 Fixed CmdHF15Write/Readblock/Readmulti bug on sanity check when '-u <uid>' argument is passed in command. Formating. 2023-02-22 10:12:18 +01:00
iceman1001 b86e29fca1 init structure with zeros 2023-02-21 04:42:51 +01:00
iceman1001 4807fae885 in private case we calloc, need to free that memory 2023-02-21 04:42:24 +01:00
Iceman 0f4d6492f7
Merge pull request #1922 from DidierA/fix_cmdlist 
bugfix: wrong text in hf mfdes list when no data exists in trace
 2023-02-21 03:47:56 +01:00
DidierA 3e952b8036 bugfix: wrong text in hf mfdes list when no data exists in trace 2023-02-21 01:50:33 +01:00
Matthew Jackson 5f56ffcbf1 Merge branch 'master' into 213TT 2023-02-20 02:18:57 -06:00
Matthew Jackson 147475ab40 CHANGELOG.md and text changes 2023-02-20 02:07:07 -06:00
Iceman 9b331b37ae
Merge pull request #1919 from henrygab/no_buffer_overflow 
Prevent buffer overflow in `AppendGraph()`
 2023-02-19 10:58:57 +01:00
Matthew Jackson 3399cbd4f0 support for NTAG213TT tamper feature 2023-02-18 23:48:32 -06:00
iceman1001 029d5aa358 fix cid #404827 - resource leak 2023-02-18 22:51:44 +01:00
Henry Gabryjelski 28af1a870d Prevent buffer overflow in AppendGraph() 2023-02-18 12:50:05 -08:00
Henry Gabryjelski 48ca513a96 updates from make style 2023-02-17 17:27:07 -08:00
iceman1001 944d6ee596 simpler 2023-02-17 17:51:59 +01:00
Boris Fersing 5d4fe5b8df - Mark the credentials as decrypted when decrypting a dump 
- In the view command, show the credentials if the input dump is decrypted
 2023-02-17 10:18:00 -05:00
iceman1001 bfd2fc2a56 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-02-14 21:17:36 +01:00
iceman1001 736d24cdab increased the readline package to 8.2 2023-02-14 21:16:38 +01:00
Jean-Michel Picod 5a2c6406d8 Allow current directory to import python libraries 
also fixed a bunch of wrong comments.
 2023-02-13 21:58:34 +01:00
iceman1001 3ee7ac3254 style 2023-02-11 11:53:20 +01:00
iceman1001 08d2c2f1a5 style 2023-02-11 11:42:58 +01:00
Nate Sales 66f227df9f
Merge branch 'master' into hficlass-encode-verbose 
Signed-off-by: Nate Sales <nate@natesales.net>
 2023-02-09 17:18:31 -05:00
Nate Sales 5133d4a512 feat: add -v verbose flag to "hf iclass encode" 2023-02-08 20:49:49 -05:00
ah01 b0dcfdf2c5 Add new UID of Waveshare 1.54" NFC ePaper (probably new HW revision) 2023-02-09 01:22:04 +01:00
Self Not Found a7bc082d2d
Add a option to clear the scrollback buffer 2023-02-05 17:37:13 +08:00
U-CHRIS-PC\Chris 3ec3730183 Added XOR extraction and flag to Guardall G-Prox II 2023-02-02 15:53:52 -07:00
iceman1001 23a3590bba unify the text comments 2023-02-02 21:24:34 +01:00
adite dfd8c8aefc Merge branch 'master' of https://github.com/adite/proxmark3 2023-02-01 19:30:42 +01:00
adite c7825a2adf Fix bug in 'lf em 4x70 brute' command 2023-02-01 19:28:31 +01:00
Jean-Michel Picod 8be70ea560 Fix minor bugs in hf tesla info 2023-01-30 23:27:17 +01:00
Iceman cf69893641
Merge branch 'master' into fix_lf_bps 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-01-30 20:24:09 +01:00
Iceman 5a4338941d
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-01-30 20:18:19 +01:00
Self Not Found d81974e89c
Merge branch 'master' into fix_lf_bps 
Signed-off-by: Self Not Found <wh201906@yandex.com>
 2023-01-30 07:54:11 +08:00
iceman1001 2bd404b496 Revert "Release v4.16191 - Nitride" 
This reverts commit bec61e9185.
 2023-01-29 20:35:17 +01:00
iceman1001 bec61e9185 Release v4.16191 - Nitride 2023-01-29 20:35:17 +01:00
iceman1001 715ae09e7e fix coverity #404579 2023-01-29 18:37:28 +01:00
iceman1001 568e35ca84 style 2023-01-29 18:32:15 +01:00
iceman1001 b24d7736c5 fix coverity #322661 2023-01-29 18:14:49 +01:00
iceman1001 b217b4e39d fix coverity #404576 2023-01-29 18:07:59 +01:00
iceman1001 30538c20ae coverity fix #404575 2023-01-29 18:05:47 +01:00
iceman1001 db6a0ab5ef coverity fix #40581, #404580, #40579... 2023-01-29 18:02:45 +01:00
iceman1001 cd96fbfcc9 text 2023-01-29 06:35:31 +01:00
iceman1001 09f2bf9f02 style 2023-01-29 04:59:50 +01:00
iceman1001 9bd7e41d39 add dummy length to pass savejson sanity check. Thanks @mwalker33 2023-01-29 04:58:29 +01:00
Iceman 1c9fc565cb
Merge branch 'master' into fix_lf_bps 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-01-29 04:32:57 +01:00
Iceman aa8d56cb14
Merge pull request #1881 from mjacksn/NxpInfoParse 
Correct some parsing of the "get nxp system information" data from icode tags
 2023-01-29 04:29:25 +01:00
Iceman da8adace6b
Merge pull request #1885 from Alejandro12120/pm3generic-flash 
Add a proper way to check if a FW is RDV4
 2023-01-29 04:29:03 +01:00
Matthew Jackson 9041627ae5 Add hf 15 sub-commands for EAS, AFI, privacy mode, and passwords on SLIX tags 2023-01-28 13:37:20 -06:00
Adrian Teuscher 5d17177498 Merge branch 'master' of https://github.com/adite/proxmark3 2023-01-27 19:45:06 +01:00
Adrian Teuscher 71389e0b17 Add function to brute force partial key 2023-01-27 19:37:40 +01:00
Matthew Jackson db01a3b360 Detect 50 pF version of NTAG 210u (micro) 2023-01-27 11:23:00 -06:00
Alejandro 63e54e94a8
Merge branch 'RfidResearchGroup:master' into pm3generic-flash 2023-01-27 15:02:19 +01:00
iceman1001 37d059d56f style 2023-01-27 03:00:26 +01:00
iceman1001 da470c928c data raw --fs -i, fix the accidental reverse of the invert param 2023-01-27 02:53:54 +01:00
Iceman 1ba0715320
Merge pull request #1887 from gtalusan/amiibo-sim 
unconditionally recalculate pwd/pack for amiibo simulation
 2023-01-27 02:50:26 +01:00
Jean-Michel Picod 86d26f9464 Fix uninitialised stack-based buffers 2023-01-26 01:13:27 +01:00
George Talusan 1c3a1a0660
unconditionally recalculate pwd/pack for amiibo simulation 2023-01-25 10:50:20 -05:00
Alejandro c9fb1f2cc7
Merge branch 'RfidResearchGroup:master' into pm3generic-flash 2023-01-24 23:02:19 +01:00
Alejandro 474aaed4b7
Added a proper way to check if it is rdv4 fw 2023-01-24 23:01:28 +01:00
Philippe Teuwen 40f37c2c42 Missing cmdhftesla.c in client/experimental_lib/CMakeLists.txt 2023-01-24 15:41:40 +01:00
colonelborkmundus 9a123d943d add extra keys from flipper unleashed dictionary 2023-01-24 00:46:04 -05:00
Self Not Found 7e8ffb46b7
Merge branch 'RfidResearchGroup:master' into fix_lf_bps 2023-01-24 11:12:38 +08:00
Alejandro da84eb6206
proper way 2023-01-23 20:41:00 +01:00
mhjack 8bbc5934b5 Add detection and info command behavior for NTAG 5 devices, enable EAS status check in info command for SLI, SLIX, SLIX-L, and SLIX-S tags which all support EAS mode 
(cherry picked from commit a430439f05654fe62c365f4c8f5ee13cb4103dfa)
 2023-01-22 23:31:32 -06:00
mjacksn 37ec19fdbf Correct some parsing of the "get nxp system information" data. I believe that these changes bring it in line with the SLIX "GET NXP SYSTEM INFOMATION" data format (as retrieved from SLIX2 datasheet page 33) 2023-01-22 23:27:09 -06:00
iceman1001 c364a6821c hf tesla info - better textual output 2023-01-23 03:32:38 +01:00
iceman1001 6d12f0281a hf telsa info - better text, also added detection of the gauss key applet 2023-01-23 03:26:51 +01:00
Iceman bc576c9e6d
Merge pull request #1876 from colonelborkmundus/dictionaries 
modified:   client/dictionaries/mfc_default_keys.dic
 2023-01-23 02:48:52 +01:00
colonelborkmundus ad9771b4c0 removed modified files from pull request 2023-01-22 11:57:32 -05:00
Iceman 2d25d66f3b
Merge pull request #1871 from RouNNdeL/fix/mf-classic-sector-read 
Fix mifare classic dump when block cannot be read
 2023-01-22 17:14:22 +01:00
Iceman 0a2517feb6
Merge pull request #1873 from jmichelp/master 
Fix python initialization to have SWIG work
 2023-01-22 16:49:16 +01:00
Iceman ed21af641a
Merge pull request #1872 from zebbe-94/master 
Fix typo in smart info
 2023-01-22 16:48:24 +01:00
wh201906 239a8646b2 Fix the wrong sample count when bps!=8 2023-01-22 15:38:09 +00:00
colonelborkmundus af00fde250 additional 1k keys, fresh from the oven 2023-01-22 02:36:19 -05:00