Commit Graph

19449 Commits

Author SHA1 Message Date
iceman1001 bce77f3e2b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-11-07 21:52:17 +01:00
iceman1001 e65a15337e text 2024-11-07 21:52:07 +01:00
Philippe Teuwen 7be2a671c8 python script: add --fast 2024-11-07 21:42:04 +01:00
iceman1001 0778d1aa6b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-11-07 21:36:11 +01:00
iceman1001 32028fd53f minor text 2024-11-07 21:36:02 +01:00
iceman1001 27fee07090 style 2024-11-07 21:34:35 +01:00
Philippe Teuwen f65639aa3b spaces 2024-11-07 21:14:30 +01:00
Iceman 855bccf5b9 Merge pull request #2623 from Antiklesys/master
Minor hf iclass configcard fixes
2024-11-07 21:09:07 +01:00
Philippe Teuwen 4decf6545d fudanValidate 2024-11-07 20:49:56 +01:00
Philippe Teuwen e4c283af5e docstrings 2024-11-07 20:24:37 +01:00
Philippe Teuwen 8e43d12e4b still more typos... 2024-11-07 19:37:15 +01:00
Philippe Teuwen 2ef8493cf1 still more typos... 2024-11-07 19:34:42 +01:00
Philippe Teuwen 0fe5825004 lprint: deal with prompt differently 2024-11-07 19:27:51 +01:00
Philippe Teuwen ea83ce81aa typo 2024-11-07 19:24:44 +01:00
Philippe Teuwen 36c9790902 few fixes 2024-11-07 19:12:37 +01:00
Antiklesys 480b632528 Minor hf iclass configcard fixes
Fixed error messaging that was swapped between card key and keyroll key
2024-11-08 01:57:08 +08:00
Philippe Teuwen a6c2535e88 python script: add fast dump 2024-11-07 18:01:59 +01:00
Philippe Teuwen 13c8ca76fc python script: added few FIXME 2024-11-07 17:34:56 +01:00
Philippe Teuwen 2293874402 python script: wip, less globals, clearer dataflow 2024-11-07 17:01:35 +01:00
Philippe Teuwen 5e2b093b3e python script: start making changes as discussed in the MR, wip 2024-11-07 14:35:46 +01:00
Philippe Teuwen d0bd3266f2 python script: making Fluke8 pleased 2024-11-07 14:01:24 +01:00
Iceman 917427cb8c Merge pull request #2621 from Antiklesys/master
Fixed keygen bug in legrec
2024-11-07 12:59:14 +01:00
Antiklesys 0b7d76d7cd Fixed keygen bug in legrec
Fixed legrec bug that was generating blank keys after misalignment in commit: 110dfab668
2024-11-07 19:20:50 +08:00
Iceman cf7431c98d Merge pull request #2613 from csBlueChip/master
Fudan FM11R08* full-card recovery script; with Bambu tag support
2024-11-07 01:38:16 +01:00
BlueChip f85fbe7120 update licence for proxmark submission 2024-11-06 22:16:19 +00:00
BlueChip 55f8e6ed4b refactor console flushing; make indentation consistent; change the word 'hash' for 'sig'nature 2024-11-06 21:31:58 +00:00
Philippe Teuwen 2c2d1d0c1b fix compiler warning 2024-11-06 18:49:29 +01:00
Iceman d019477420 Merge pull request #2620 from Antiklesys/master
Improved algorithm for hf iclass legrec
2024-11-06 10:36:31 +01:00
Antiklesys 110dfab668 Improved algorithm for hf iclass legrec
Improved algorithm for hf iclass legrec by taking in account the hash0 limitations for the ending bits distributions of each key bite, thus reducing the key entropy and number of required tries from 2^24 to almost 2^19
2024-11-06 16:52:48 +08:00
Iceman 106de8f3bb Merge pull request #2619 from Antiklesys/master
Fixed elite configcard generation
2024-11-06 09:44:55 +01:00
Antiklesys a8204187ab Fixed elite configcard generation
Fixed elite configcard generation. From nfc-iclass and other resources block 13 generation was completely missing.
This resulted in configcards for legacy readers to be working on Rev.A readers but not Rev.C readers when it came to setting elite keys or enabling keyrolling.
2024-11-06 16:38:32 +08:00
Philippe Teuwen 86b8549d2b hf mf ecfill: show dump time 2024-11-06 00:27:33 +01:00
iceman1001 73e5045bcd fix loading nfc files 2024-11-05 22:28:00 +01:00
Philippe Teuwen 46813e0e50 hf mf isen: rewrite counters, add specific NONCE_SUPERSTATIC case (when first nt == nested nt) 2024-11-05 17:07:54 +01:00
Philippe Teuwen 6706bdb13f hf mf isen: detect special static nonce nt_first==nt_nested 2024-11-05 09:30:22 +01:00
Iceman c0befc416c Merge pull request #2618 from Einstein2150/patch-2
Update mfc_default_keys.dic
2024-11-04 18:19:48 +01:00
Einstein2150 0d28545fb5 Update mfc_default_keys.dic
added Hotel cards from Austria
AB287B3B4903
7B0DEDA7E162

Signed-off-by: Einstein2150 <Einstein2150@users.noreply.github.com>
2024-11-04 15:47:42 +01:00
Iceman 3402e7f5a8 Merge pull request #2617 from nvx/fix_ssp_clk_tc2_initial_reset_rollover
fix ssp_clk sometimes resetting to 0 shortly after being started or reset
2024-11-04 13:28:46 +01:00
Iceman b6c493e7b7 Merge pull request #2615 from jmichelp/legic
Start fixing legic script to work with lu5.4
2024-11-04 13:27:07 +01:00
Iceman e1da024481 Merge pull request #2616 from jmichelp/fix14b
Fix potential overflow in readblock
2024-11-04 13:25:26 +01:00
Iceman bcf4f6e726 Merge pull request #2614 from jmichelp/master
Some fixes on PIV
2024-11-04 13:24:30 +01:00
nvx 5c195b8a14 fix ssp_clk sometimes resetting to 0 shortly after being started or reset
this could happen if TC2 was already 0 when it was started or reset
resulting in the initial reset not happening until TC0 had overflowed for
the first time as the delay to ensure this didn't happen would be missed
when TC2 was already 0

the new behaviour results in TIOA0 being toggled when a software trigger
of TC0 happens which makes TC2 reset immediately without having to wait
for TC0 to overflow
2024-11-04 22:04:05 +10:00
Jean-Michel Picod 43f6d0bcfd Fix potential overflow in readblock 2024-11-04 12:22:50 +01:00
Jean-Michel Picod ae1de2c6c8 Start fixing legic script to work with lu5.4 2024-11-04 12:18:37 +01:00
Jean-Michel Picod 68734f4191 Fix some PRI* macro usage. 2024-11-04 11:31:30 +01:00
Jean-Michel Picod a0214f12d4 Move all integer printing to use PRI* macros
Hopefully will make CodeQL happy this time.
2024-11-04 11:21:53 +01:00
Jean-Michel Picod b02c6ece26 Fix confusion between base10 and base16 identifiers 2024-11-04 10:00:29 +01:00
Jean-Michel Picod bb30b9dc8b Make CodeQL happy 2024-11-04 09:52:44 +01:00
Jean-Michel Picod 1dbfb7b3a3 Correctly parse extended length (MistialDev's card) 2024-11-04 09:52:44 +01:00
BlueChip 3e1c21ac83 Fudan FM11R08* full-card recovery script; with Bambu tag support 2024-11-04 02:02:31 +00:00