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

16702 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Iceman 359deb9d1d
Merge pull request #1997 from berlin4apk/master 
New keys
 2023-05-26 04:45:19 +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 0606388e03 Updated CHANGELOG.md 2023-05-24 22:02:20 -04: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
Iceman a95ba87834
Merge pull request #1987 from penegui/master 
Adjusting hf_msdsal standalone module
 2023-05-24 15:06:19 +02:00
Davi Mikael 416abae4bb Changing token and uid of hf_msdsal 2023-05-24 09:49:40 -03:00
Davi Mikael 757e53c6ac removing debug statement in iso14443a 2023-05-24 09:48:00 -03:00
Davi Mikael 440c5ac1fa
Merge branch 'RfidResearchGroup:master' into master 2023-05-24 09:33:20 -03: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
Iceman 38560926df
Merge pull request #1995 from net147/hf-mf-sim-reset-4ms 
hf mf sim: reduce 6ms threshold to 4ms for reset to idle
 2023-05-24 07:29:31 +02:00
Jonathan Liu d25f20fb10 hf mf sim: reduce 6ms threshold to 4ms for reset to idle 
Fixes some readers not being able to detect the simulated card on
second Inventory command due to the RF field being powered off for
a short time before being turned on again to reset the card to idle
state.

Closes #1974
 2023-05-24 15:23:37 +10:00
iceman1001 74bb64f316 formatting 2023-05-24 07:01:33 +02:00
Iceman 04f2f3b1e1
Merge pull request #1994 from d18c7db/master 
Synchronized minor FPGA orphaned change
 2023-05-23 17:44:20 +02:00
d18c7db c10fbacd20 Synchronized minor FPGA orphaned change 
In file hi_iso14443a.v from fpga-xc3s100e to fpga-xc2s30 and rebuilt the FPGA bitstream files for the Spartan-2
 2023-05-23 14:26:20 +02:00
Iceman 46e47fee6d
Merge pull request #1991 from OscarAkaElvis/master 
Add python3 transformation script - nfc to eml
 2023-05-23 13:12:48 +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 cfb3a52782
Merge pull request #1990 from corysolovewicz/patch-3 
Update CHANGELOG.md
 2023-05-23 12:44:11 +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
Iceman e623aeebf1
Merge pull request #1988 from corysolovewicz/patch-1 
Update amiibo_tools.lua
 2023-05-23 12:38:10 +02:00
Iceman 9579f2193d
Merge pull request #1983 from 0xdanneh/hitag2-password-write-timing 
'Fix' writing on hitag2 in password mode
 2023-05-23 12:37:08 +02:00
Self Not Found 98c0046bdb
Update CHANGELOG.md 2023-05-21 10:51:10 +08:00
Self Not Found ca6e9e4ba9
Auth both key A and key B in hf mf restore 2023-05-21 10:07:17 +08:00
Óscar Alfonso Díaz 5132900d9c
Update CHANGELOG.md 
Signed-off-by: Óscar Alfonso Díaz <oscar.alfonso.diaz@gmail.com>
 2023-05-20 00:05:55 +02: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 6f8a4eb79a
Update CHANGELOG.md 
Add description of changes to the change log. 

Signed-off-by: Cory Solovewicz <cory@solovewicz.com>
 2023-05-18 09:43:06 -07: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
Davi Mikael 6d1b5b8e13
Merge branch 'RfidResearchGroup:master' into master 2023-05-15 13:59:04 -03:00
0xdanneh dadaf9cd11 'Fix' writing on hitag2 in password mode 
Needs more investigation, but it does solve the issue of write commands not working consistently
 2023-05-08 20:48:41 +01:00
iceman1001 5b53bf803d Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-05-08 20:40:04 +02: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
Christian Herrmann b52dfa381b fix output when printing 0,1 numbers like in nested, view commands. Bonus, added NDEF key detection to give hint 2023-05-08 20:03:31 +02:00
PhaseLoop 1fd331ea7f remove dead code 2023-05-08 17:57:14 +00:00
PhaseLoop d74b625b8b place bruteforce lib with em4x50 in Makefile 2023-05-08 17:20:35 +00:00
PhaseLoop 19d7851c73 run "make style" 2023-05-08 17:08:24 +00:00
phaseloop fa033a98b2 enable em4x50 bruteforce in proxmark firmware 2023-05-06 14:47:45 +00:00