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

10522 commits

Author SHA1 Message Date
iceman1001 c937e3b760 fix tear off to work with topaz wrbl. fix topas wrbl to handle LOCK/OTP block 13,14, which needs write_nonerase command, fixed output for rdbl 2023-06-24 00:02:50 +02:00
iceman1001 c6e9f9781c fix char 2023-06-23 20:02:56 +02:00
iceman1001 5087581a50 fix some wrong sector comparisions. And return value for restore command when sending wrbl. 2023-06-23 19:58:33 +02:00
iceman1001 55b780074f move defines 2023-06-23 18:59:16 +02:00
iceman1001 2d70ff5085 fix compilation by adding the WIP func 2023-06-23 18:33:16 +02:00
iceman1001 3fbd53ac2f hf mf wipe - text 2023-06-23 18:27:33 +02:00
iceman1001 b8d3b281ad adapt non commit functions yet 2023-06-23 18:07:56 +02:00
iceman1001 bf8ac54c38 fix loop logic. thanks @jump 2023-06-23 17:58:22 +02:00
iceman1001 85d4e99ae9 mfp changes... 2023-06-23 17:51:39 +02:00
iceman1001 d1b62a5fc2 fix wrong sector trailer detection 2023-06-23 17:44:15 +02:00
iceman1001 25f84bcb8e fix 14b detection in hf search 2023-06-23 17:21:47 +02:00
iceman1001 8700b1e754 fix hf mf mad loading mad v2 sector 2023-06-23 17:14:58 +02:00
iceman1001 4b12d67632 text and fixes for MAD v2 2023-06-23 17:12:29 +02:00
iceman1001 a508ed7646 fix hf mf dump 2023-06-23 17:10:04 +02:00
iceman1001 88e2618131 function to support figuring out if block 0-3 , 0-15 is sectortrailer. The previous function uses 0-255.. 2023-06-23 17:08:32 +02:00
iceman1001 ed34453461 maur 2023-06-23 16:27:30 +02:00
iceman1001 419d0c1f5b adapt return codes for some mifare commands and their debug logging. this will reduce debug message on the client side 2023-06-23 16:25:43 +02:00
iceman1001 673f15c247 text 2023-06-23 14:19:50 +02:00
iceman1001 7fe02233d8 textual changes to MAD output 2023-06-23 13:56:59 +02:00
iceman1001 db4086718d kety length checks for hf mf rdbl, rdsc, wrbl, and some textual changes to hf mf mad 2023-06-23 13:37:37 +02:00
iceman1001 59a2b63d6b thanks to user Hawkeye which tested on old conference badges on a NTAG216 2023-06-23 06:56:05 +02:00
Thomas 492a09f5cc correct LEGIC 16bit CRC calculation "hf legic crc", use init_table(CRC_LEGIC_16) to be consistent with l_crc16legic in client/src/scripting.c 2023-06-22 22:51:16 +02:00
kormax 57b827613b Update aidlist.json 2023-06-22 18:30:52 +03:00
kormax 1bd389bdd0 Add annotation for AirDrop ECP frame 2023-06-22 18:06:23 +03:00
iceman1001 c7af716942 style 2023-06-21 18:49:12 +02:00
iceman1001 d3792c0853 adapt mifare plus key files to be loaded/saved in json. WIP , will need a typedef struct in order to work properly 2023-06-21 18:48:04 +02:00
iceman1001 cdb906cd23 style 2023-06-21 18:45:59 +02:00
iceman1001 681382e0cc new AID for Kiev metro card 2023-06-21 18:45:25 +02:00
iceman1001 a4a7033b23 adapt comparision of text 2023-06-21 18:43:21 +02:00
iceman1001 d65094b7e0 fixed some color to mad directory printings and fixed a sector issue in when saving keyfiles to Mifare Plus cards 2023-06-19 15:01:40 +02:00
iceman1001 2010d10f81 forgot to push function rename 2023-06-16 05:34:52 +02:00
iceman1001 28fa53170e hf mfp mad now has same checks as mf mad cmd 2023-06-16 04:34:26 +02:00
iceman1001 620e5f4951 simplify logic 2023-06-15 22:47:21 +02:00
Philippe Teuwen be507e1662 Avoid spurious 'No history will be recorded' error on fresh install 2023-06-15 16:09:15 +02:00
Jean-Michel Picod d9ed07c77c Missed one line for LegicCash uid 2023-06-14 16:41:42 +02:00
Jean-Michel Picod fdd85d7e1e Fix LegicCash segment CRC computation 2023-06-14 16:41:42 +02:00
iceman1001 6fd0d93647 fixed the trace list output when marking crcbytes in color mode. Some odd cases exists. 2023-06-14 14:24:41 +02:00
iceman1001 f370e0df71 revert 2023-06-12 21:12:24 +02:00
iceman1001 8ac04b2d21 style on hf mf rdsc , hf mf rdbl, to match the MF commands 2023-06-12 20:34:06 +02:00
iceman1001 f462e6bd02 hf mfp rdsc - style similar to MF commands 2023-06-12 20:14:12 +02:00
iceman1001 383c52c1bd added colors and show all sectors in range for hf mf chk 2023-06-12 19:54:05 +02:00
iceman1001 3de4f5225b enable fingerprint for UL-C tags too 2023-06-11 22:59:10 +02:00
iceman1001 5505096483 text 2023-06-11 22:41:52 +02:00
iceman1001 4180f6bfe2 added philips toothbrush detection in hf mfu info and generator in hf mfu pwdgen -r 2023-06-11 21:52:42 +02:00
iceman1001 d5f8202284 textual 2023-06-10 12:03:39 +02:00
Angel 2adfc928fc
Merge branch 'master' into master 
Signed-off-by: Angel <jeremy_1996@hotmail.com>
 2023-06-04 11:39:45 -04:00
Angel dc1a0936da Re-added old checksum under command parameter for demod and read. 2023-06-04 11:38:13 -04:00
iceman1001 97eb0238b1 style 2023-06-02 10:45:04 +02:00
iceman1001 1107c214c5 hf mf ndefformat now uses the binary key loading 2023-05-30 16:19:33 +02:00
iceman1001 2356dfea73 hf mf restore - now uses the binary key loading fct() 2023-05-30 14:14:21 +02:00
iceman1001 7c8e9db822 allow user abort when wiping 2023-05-30 13:46:52 +02:00
iceman1001 7368cccdf9 Disney MagicBand 2023-05-29 06:57:39 +02:00
iceman1001 f17ce1fd68 revert one debug message 2023-05-28 12:40:57 +02:00
iceman1001 2b90683aff added debug output for usart comms 2023-05-28 12:34:29 +02:00
iceman1001 6d22b606c2 adapt comparison 2023-05-28 10:26:07 +02:00
iceman1001 336bd06d88 type fix 2023-05-28 07:34:27 +02:00
iceman1001 1d0da726ec the clocks for usart rxtx wasnt enabled. 2023-05-27 21:10:11 +02:00
iceman1001 32fcf5e870 make 16 bytes default cols 2023-05-27 17:00:28 +02:00
iceman1001 0cc7373655 fix resource leaks 2023-05-27 12:10:32 +02:00
iceman1001 328e5461f8 added "--sk" param to hf mf eview and view commands. This param extracts and saves keys to binary key file 2023-05-27 10:46:42 +02:00
iceman1001 71f934dbd7 text 2023-05-27 10:28:54 +02:00
iceman1001 5c604de4c1 adapt hardnested bitflip arrays to load 2023-05-27 10:26:30 +02:00
iceman1001 231307252b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-05-27 10:05:29 +02:00
Iceman 1571f95a2a
Merge pull request #1982 from phaseloop/em4x50-bruteforce 
Bruteforce engine to crack non-random 32 bit keys
 2023-05-27 10:06:09 +02:00
PhaseLoop 0f4b787df1 replace bzero with memset 2023-05-27 07:18:59 +00:00
iceman1001 d1783ce2a4 text 2023-05-27 08:49:18 +02:00
iceman1001 94e4afaa03 fix signature key bug and simplify logic 2023-05-26 05:36:07 +02:00
iceman1001 01333c7a27 simplify logic 2023-05-26 05:22:04 +02:00
iceman1001 c35749dd13 adapting to the new return value from hardnested 2023-05-26 05:20:29 +02:00
iceman1001 71ae06cf8b style 2023-05-26 05:12:01 +02:00
iceman1001 15c751231f adapting default keys array 2023-05-26 05:11:17 +02:00
iceman1001 a62811ae69 hf mf hardnested, now indicates if it failed when recovering key 2023-05-26 05:10:37 +02:00
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
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