Commit Graph
16614 Commits
Author SHA1 Message Date
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 da250f9eed adapted to handle the bluetooth identifier on a Proxmark SE device. Full name is identifier is: Proxmark SE(TEST) 2023-05-28 08:24:06 +02:00
iceman1001 336bd06d88 type fix 2023-05-28 07:34:27 +02:00
Iceman 9df031b5a0 Merge pull request #1999 from d18c7db/master
Fix truncated FPGA upload due to incorrect integer size variable
2023-05-27 21:58:00 +02:00
d18c7db c5c0ef36a7 Fix truncated FPGA upload due to incorrect integer size variable 2023-05-27 21:47:51 +02:00
iceman1001 62b184ce49 adapt usart rx to enable clocks 2023-05-27 21:12:58 +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 82886e2036 reverting back to threshold 5, HF reading becomes better. Keeping the Simulation threshold 2023-05-27 10:30:52 +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
PhaseLoop 22ae67d2cf Revert doc autostyle 2023-05-26 07:20:27 +00: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
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
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