Commit graph

3353 commits

Author SHA1 Message Date
iceman1001 60cc36b398 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-07-17 19:34:43 +02:00
iceman1001 c70e5beeac changed legic sim to have a different loop and exit message. Added some colors in output and the return codes on deviceside for legisim now uses the same PM3_E* styled 2023-07-17 19:31:37 +02:00
iceman1001 134f09be5e style 2023-07-17 17:46:27 +02:00
kormax 7f5e1c9657 Move custom polling frame generation logic to client 2023-07-16 19:27:38 +03:00
kormax a9cba02514 Move custom polling frame generation logic to client 2023-07-16 17:39:32 +03:00
kormax 45ca9ab4d6 Reduce struct memory footprint by reducing array sizes 2023-07-16 16:56:07 +03:00
kormax c4f1b0768d Pass polling config via pointer instead of by-value, thus saving RAM 2023-07-16 16:49:31 +03:00
iceman1001 8fc05ad2a5 style 2023-07-16 15:30:43 +02:00
kormax 0094318515 Make ISO14443-A polling method more flexible 2023-07-16 14:46:30 +03:00
iceman1001 6cc59848d5 fix bug in return code for hf mf writeblock where it would say it succeeded when it didnt 2023-07-15 11:51:08 +02:00
nvx a9c0fd0b1c Fix regression caused by edd8e36 (PR #2021).
Mifare Classic KeyA/B were accidentally switched in some contexts.
2023-07-12 23:04:29 +10:00
iceman1001 e43f6804a1 style 2023-07-06 22:37:34 +02:00
Iceman 43fc4e1c1b
Merge pull request #2001 from d18c7db/master
Unified fpga folders
2023-07-05 13:49:40 +02:00
nvx edd8e36d80 Cleanup arm-side reader-mode mifare classic block read/write code. 2023-07-04 00:11:01 +10:00
Alex 9a1f0356a6
Merge branch 'RfidResearchGroup:master' into master 2023-07-03 14:45:52 +02:00
iceman1001 ed0d18f05d QL88 tag identification. Thanks to AnnPlusPluss and Atlab for finding the key 2023-06-28 13:27:50 +02:00
iceman1001 b0c2ad8ac2 style 2023-06-27 15:25:00 +02:00
iceman1001 f36ec46455 minor rename 2023-06-26 15:01:44 +02:00
iceman1001 adfebd6510 text 2023-06-26 15:01:08 +02:00
Iceman e83960a43d
Merge pull request #1856 from szjiajin/MifareComplianceFix
Mifare compliance fix
2023-06-26 13:46:31 +02:00
iceman1001 c7d004de63 Revert "Release v4.16717 - seven"
This reverts commit bc18dbd847.
2023-06-26 13:10:45 +02:00
iceman1001 bc18dbd847 Release v4.16717 - seven 2023-06-26 13:10:45 +02:00
iceman1001 f64f538519 style 2023-06-25 22:30:58 +02:00
iceman1001 d40a89b27b improve the ecfill function used in autopwn among others. Lessen failed auth/reads by skipping s 16,17 using key A for MFC EV1 cards 2023-06-25 16:22:39 +02:00
iceman1001 74f02fef8a style 2023-06-24 17:16:28 +02:00
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 a4e22416b9 less debug output when an auth fails 2023-06-23 18:28:44 +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
Alex 78f2d9b958
Merge branch 'RfidResearchGroup:master' into master 2023-06-16 15:46:49 +02:00
nvx 5c9c360977 Fix hf iclass/15693 sniff trace timings.
Previously reader durations would be reported to be twice as long
in the trace vs reality, and as a result the start time would be
earlier than it should have been as well.
Also fixes a minor sniff trace timing with card dual subcarrier
responses.
2023-06-15 22:19:02 +10:00
Alex cc6b9511d8
Merge branch 'RfidResearchGroup:master' into master 2023-06-05 19:47:20 +02:00
iceman1001 97eb0238b1 style 2023-06-02 10:45:04 +02:00
d18c7db c59bdec4f2 Unified fpga folders 2023-05-30 19:47:27 +02:00
iceman1001 336bd06d88 type fix 2023-05-28 07:34:27 +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
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
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
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
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
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
Davi Mikael 2d72bbd751
Merge branch 'RfidResearchGroup:master' into master 2023-05-05 16:22:31 -03: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