RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 16:56:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
16827 commits 3 branches 14 tags 86 MiB
Commit graph

16827 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iceman 62aefa6d27
Merge pull request #2011 from kormax/more-ecp-annotations 
Update aidlist, add new ECP annotation
 2023-06-22 18:15:14 +02:00
kormax 57b827613b Update aidlist.json 2023-06-22 18:30:52 +03:00
kormax 1bd389bdd0 Add annotation for AirDrop ECP frame 2023-06-22 18:06:23 +03:00
iceman1001 c7af716942 style 2023-06-21 18:49:12 +02:00
iceman1001 d3792c0853 adapt mifare plus key files to be loaded/saved in json. WIP , will need a typedef struct in order to work properly 2023-06-21 18:48:04 +02:00
iceman1001 cdb906cd23 style 2023-06-21 18:45:59 +02:00
iceman1001 681382e0cc new AID for Kiev metro card 2023-06-21 18:45:25 +02:00
iceman1001 a4a7033b23 adapt comparision of text 2023-06-21 18:43:21 +02:00
Alex 4dcde5e6fb
Merge branch 'RfidResearchGroup:master' into master 2023-06-19 19:52:25 +02:00
iceman1001 d65094b7e0 fixed some color to mad directory printings and fixed a sector issue in when saving keyfiles to Mifare Plus cards 2023-06-19 15:01:40 +02:00
Alex 78f2d9b958
Merge branch 'RfidResearchGroup:master' into master 2023-06-16 15:46:49 +02:00
iceman1001 2010d10f81 forgot to push function rename 2023-06-16 05:34:52 +02:00
iceman1001 d861354344 fix pm3-flash-all script, where the identification of outdated bootloader failed because of the comparision didnt match any longer 2023-06-16 05:33:35 +02:00
iceman1001 28fa53170e hf mfp mad now has same checks as mf mad cmd 2023-06-16 04:34:26 +02:00
iceman1001 620e5f4951 simplify logic 2023-06-15 22:47:21 +02:00
Philippe Teuwen be507e1662 Avoid spurious 'No history will be recorded' error on fresh install 2023-06-15 16:09:15 +02:00
Iceman 272170dc16
Merge pull request #2010 from nvx/bugfix/fix_15693_sniff_reader_timings 
Fix hf iclass/15693 sniff trace timings.
 2023-06-15 14:26:36 +02:00
Iceman 21460d5a52
Merge branch 'master' into bugfix/fix_15693_sniff_reader_timings 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-06-15 14:26:27 +02:00
nvx 6d48b1a5dd Update changelog 2023-06-15 22:23:46 +10: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
Iceman 1ee7a72a2e
Merge pull request #2009 from jmichelp/legic 
Fix LegicCash segment detection/handling in lua script
 2023-06-15 10:57:29 +02:00
Jean-Michel Picod 45b710dc0a changelog 2023-06-14 16:42:11 +02:00
Jean-Michel Picod d9ed07c77c Missed one line for LegicCash uid 2023-06-14 16:41:42 +02:00
Jean-Michel Picod fdd85d7e1e Fix LegicCash segment CRC computation 2023-06-14 16:41:42 +02:00
iceman1001 6fd0d93647 fixed the trace list output when marking crcbytes in color mode. Some odd cases exists. 2023-06-14 14:24:41 +02:00
iceman1001 f370e0df71 revert 2023-06-12 21:12:24 +02:00
iceman1001 8ac04b2d21 style on hf mf rdsc , hf mf rdbl, to match the MF commands 2023-06-12 20:34:06 +02:00
iceman1001 f462e6bd02 hf mfp rdsc - style similar to MF commands 2023-06-12 20:14:12 +02:00
iceman1001 383c52c1bd added colors and show all sectors in range for hf mf chk 2023-06-12 19:54:05 +02:00
iceman1001 3de4f5225b enable fingerprint for UL-C tags too 2023-06-11 22:59:10 +02:00
iceman1001 5505096483 text 2023-06-11 22:41:52 +02:00
iceman1001 1caf4ad1d2 text 2023-06-11 22:30:09 +02:00
iceman1001 219d38e0fa added test for philips in the selftest 2023-06-11 21:53:42 +02:00
iceman1001 4180f6bfe2 added philips toothbrush detection in hf mfu info and generator in hf mfu pwdgen -r 2023-06-11 21:52:42 +02:00
iceman1001 5df82c537c missed one file 2023-06-11 21:33:04 +02:00
iceman1001 dfc338c384 philips pwd/pack gen algo 2023-06-11 20:04:26 +02:00
iceman1001 f1d78c4e7c new crc16 option used with Philips toothbrushes. different init value 0x49a3. Should be reported to the CRC catalog https://reveng.sourceforge.io/crc-catalogue/16.htm 2023-06-10 12:17:56 +02:00
iceman1001 d5f8202284 textual 2023-06-10 12:03:39 +02:00
Alex cc6b9511d8
Merge branch 'RfidResearchGroup:master' into master 2023-06-05 19:47:20 +02:00
Iceman 005fddfe6d
Merge pull request #1996 from jerji/master 
Add ability to simulate paradox fobs from fc and cn
 2023-06-04 21:59:28 +02:00
Angel 2adfc928fc
Merge branch 'master' into master 
Signed-off-by: Angel <jeremy_1996@hotmail.com>
 2023-06-04 11:39:45 -04:00
Angel dc1a0936da Re-added old checksum under command parameter for demod and read. 2023-06-04 11:38:13 -04: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 1107c214c5 hf mf ndefformat now uses the binary key loading 2023-05-30 16:19:33 +02:00
iceman1001 2356dfea73 hf mf restore - now uses the binary key loading fct() 2023-05-30 14:14:21 +02:00
iceman1001 7c8e9db822 allow user abort when wiping 2023-05-30 13:46:52 +02:00
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