Commit Graph
16733 Commits
Author SHA1 Message Date
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
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 f5e93c0a1c added a test for ndef signatures 2023-05-05 22:27:00 +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
Davi Mikael 2d72bbd751 Merge branch 'RfidResearchGroup:master' into master 2023-05-05 16:22:31 -03: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
iceman1001 0c9a64438f 256kb version is too large 2023-05-05 10:45:35 +02:00
Iceman 16d8bbd05f Merge pull request #1977 from net147/hf-mf-sim-reset
hf mf sim: reduce 50ms threshold to 6ms for reset to idle
2023-05-05 06:40:15 +02:00
Jonathan Liu b1839d7318 hf mf sim: reduce 50ms threshold to 6ms for reset to idle
Fixes reader not being able to detect the simulated card on second
Inventory command due to the RF field being powered off for only 6ms
before being turned on again to reset the card to idle state.

Closes #1974
2023-05-05 12:19:11 +10:00
Iceman 52f4373de0 Merge pull request #1978 from flamebarke/patch-1
New standalone mode - LF_MULTIHID - HID 26 Bit (H1031) multi simulator
2023-05-04 15:04:08 +02:00
flamebarke dd28bc8e5d Update build_all_firmwares.sh
Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
2023-05-04 22:29:14 +10:00
flamebarke caf3bbc026 Update 4_Advanced-compilation-parameters.md
Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
2023-05-04 22:26:39 +10:00
flamebarke 6880c51ad6 Update CHANGELOG.md
Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
2023-05-04 21:55:23 +10:00