Commit graph

14917 commits

Author SHA1 Message Date
Philippe Teuwen 117bf7380f Fix multi cmds in interactive mode 2022-01-26 11:49:47 +01:00
iceman1001 a37fdb1ccf added getversion response for 14a -t 3, (simulation of desfire anticollision) 2022-01-26 06:51:34 +01:00
iceman1001 5d40df46e3 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-01-26 06:18:28 +01:00
iceman1001 581232217f added a AID and some minor style 2022-01-26 06:17:28 +01:00
iceman1001 a0d6a82752 added --raw to clone/sim 2022-01-26 06:15:43 +01:00
iceman1001 7e9067b176 style 2022-01-26 06:15:08 +01:00
Philippe Teuwen 2777fe4afa
Merge pull request #1561 from bthedorff/master
Add from comment
2022-01-26 00:15:42 +01:00
bthedorff ecb2803183
Add from comment
Adds from comment for PCSC 37Bit to make match other comments' format and for future reference if needed
2022-01-25 18:06:46 -05:00
iceman1001 d276ad8eb8 remove ending comma 2022-01-25 22:50:54 +01:00
Philippe Teuwen 140a7f34a4 make style 2022-01-23 20:02:57 +01:00
Philippe Teuwen b7e35e599f changelog 2022-01-23 20:02:15 +01:00
Philippe Teuwen 977bb8786c fix pwd presence in hf mfu dump for ULEV1/NTAG 2022-01-23 19:56:14 +01:00
Philippe Teuwen adde53dbfb hf mfu info: avoid read error when pwd is provided 2022-01-23 19:46:47 +01:00
iceman1001 b9bc5f7a38 fix xiaomi pack algo 2022-01-23 14:38:42 +01:00
iceman1001 30468731e1 restore amiibo detection 2022-01-23 01:37:30 +01:00
iceman1001 0587845c56 added another pwdgen algo 2022-01-23 01:32:14 +01:00
iceman1001 3af0f4a0fd no need to save the image file each time its shown 2022-01-22 18:37:00 +01:00
iceman1001 a7d3c15c17 hf mfdes createapp - made help text according to our standard. Still too long parameter descriptions 2022-01-22 18:36:18 +01:00
iceman1001 b246a2a53e make zero check stricter 2022-01-22 18:34:57 +01:00
iceman1001 98d291f5b1 fix hf 14a sim, on device side a sneaky detection if data started with zero, it would treat it as uid is in emulator memory. Also fixed a size issue on flag 2022-01-22 18:29:11 +01:00
iceman1001 2fc5834c98 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-01-22 16:52:40 +01:00
iceman1001 7bbca12335 desfire atqa should be 0x44 2022-01-22 16:52:32 +01:00
Philippe Teuwen bc7325d932 Adding missing fpga-xc3s100e bit files 2022-01-21 10:26:26 +01:00
Philippe Teuwen cc4b549a7d reorder changelog 2022-01-18 12:06:18 +01:00
Philippe Teuwen 6f1262aa3f Fix Wiegand P10004: remove wrong parity scheme and fix FC/CN boundary checks 2022-01-18 12:03:44 +01:00
Philippe Teuwen 0b7c529152
Merge pull request #1559 from bthedorff/master
Update wiegand_formats.c
2022-01-18 11:31:44 +01:00
bthedorff 83a40b370a
Update wiegand_formats.c
I swear I tested it after my last change and it worked.... but now it isn't so I must have made an error somewhere. It is back to sites programming and is working
2022-01-17 22:29:26 -05:00
bthedorff c9fe8d33e2
Update wiegand_formats.c
I swear it'll get it right
2022-01-17 20:54:04 -05:00
bthedorff e6d4d9af49
Merge branch 'RfidResearchGroup:master' into master 2022-01-17 18:58:30 -05:00
Philippe Teuwen a6a75b6429
Merge pull request #1560 from bettse/more_const
Be more CONSTant with the parameters we will not modify
2022-01-18 00:45:30 +01:00
Eric Betts 4c9f611141 Be more CONSTant with the parameters we will not modify 2022-01-17 14:56:47 -08:00
bthedorff f43e5f0de7
Update CHANGELOG.md
Adds support for PCSC's proprietary HID 37bit format P10004
2022-01-17 17:52:21 -05:00
bthedorff 41aeebb6ac Merge remote-tracking branch 'origin/master' 2022-01-17 17:49:42 -05:00
bthedorff 42eddf1798 Fix 37bit PCSC 2022-01-17 17:48:53 -05:00
bthedorff 661cebf6ea
Merge branch 'RfidResearchGroup:master' into master 2022-01-17 17:45:23 -05:00
Iceman 12272683cc
Merge pull request #1558 from Phil242/patch-1
Update mfc_default_keys.dic
2022-01-17 22:52:14 +01:00
Philippe Teuwen 21f556149b Fix libpm3: make sure mainret is defined. Thanks @bettse 2022-01-17 22:25:07 +01:00
bthedorff 1d354b4fae
Merge branch 'RfidResearchGroup:master' into master 2022-01-17 16:04:34 -05:00
Iceman 795e604ddb
Merge pull request #1557 from DarkMatterMatt/feat/hf-gallagher-remove-aid-limits
Improve `hf gallagher` commands
2022-01-17 19:58:12 +01:00
Matt Moran 750fd646c1 Shorten command help text, reorder changelog 2022-01-17 23:38:00 +13:00
Matt Moran a1c3465525 Merge remote-tracking branch 'upstream/master' into feat/hf-gallagher-remove-aid-limits 2022-01-17 23:28:06 +13:00
bthedorff 468199ffc9
Delete Makefile.platform 2022-01-16 21:35:15 -05:00
bthedorff 6a617f8d4a Fix 37bit PCSC 2022-01-16 21:02:43 -05:00
bthedorff 66935bdd5a Fix 37bit PCSC 2022-01-16 20:28:00 -05:00
bthedorff 72339f6ab4
Upload Make.Platform 2022-01-16 19:41:40 -05:00
bthedorff 5b830ac086
Update wiegand_formats.c 2022-01-16 19:37:10 -05:00
bthedorff a2d74f4888
Update wiegand_formats.c 2022-01-16 19:34:03 -05:00
bthedorff e25297a967
Update wiegand_formats.c 2022-01-16 19:08:58 -05:00
bthedorff 734076af27
Update wiegand_formats.c 2022-01-16 19:04:38 -05:00
bthedorff c57e3b2b0d
Update wiegand_formats.c 2022-01-16 18:45:21 -05:00