RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 07:46:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
5176 commits 3 branches 14 tags 86 MiB
Commit graph

52 commits

Author SHA1 Message Date
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
iceman1001 1ffddb2578 CHG: 'hf mfu dump' - simplify bin saving and added JSON dump format 2018-12-13 23:34:30 +01:00
merlokk b9974e1224 mfu 2018-11-14 11:24:21 +02:00
Chris 24eaac8681 CHG: the thread comms refactoring from offical pm3 repo 
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
 2018-09-06 21:43:20 +02:00
iceman1001 207fa2b574 add: potential fix for OSX uses, by @piwi 
chg:  adapting fix to support iceman forks extended commands.
 2018-05-02 08:11:29 +02:00
iceman1001 4b2a746ef5 ADD: 'hf mfu' detection of Mifare Ultralight NANO tags. 
Interesting tag with two new commands.  LOCK_SIG  / WRITE_SIG.   Need to add support for it.
https://www.nxp.com/docs/en/data-sheet/MF0UN_H_00.pdf
 2018-04-03 09:57:20 +02:00
iceman1001 24482211ad chg: the dot progress is not logged anymore. Force fflush afterwards. 2018-03-05 20:07:29 +01:00
iceman1001 f1e631ef56 chg: adapting path changes. 2017-12-24 10:32:15 +01:00
iceman1001 f46546c5a9 ADD: 'hf mfu info' - tag identification should now identify NTAG213_F , NTAG216_F (thanks for info @jackfagner) 2017-11-27 09:21:55 +01:00
iceman1001 0815f19389 ADD: new pwdgen algo, (thanks @jackfagner) who did a great job figuring it out. Read his blog. 
ref.   https://github.com/jackfagner/NfcKey/blob/master/NfcKeyC.c
 2017-11-25 08:48:36 +01:00
iceman1001 9b4e52b89e CHG: dropfield 2017-11-10 20:49:56 +01:00
iceman1001 a4b4a1a9a2 FIX: iso-14443a RATS optional (piwi) 2017-10-01 22:06:06 +02:00
iceman1001 1b6176995f chg: 'hf mfu restore' swapped some parts so to write special areas first and configblocks last. 2017-07-14 21:24:36 +02:00
iceman1001 7cf0bf19e5 FIX: 'mfu authentication' bug where the pack-length was wrong 
ADD: 'hf mfu restore'  - added a restore from file command, see helptext for instructions
CHG: some help-text updates and refactored to functions
CHG: 'hf mfu gen'  - added the possibility to read uid from card as input
CHG: 'hf mfu dump' - refactored out the dump-printing
 2017-07-13 13:10:46 +02:00
iceman1001 17a8e69e90 ADD: 'hf mfu info' type detection now support NTAG_I2C_1K_PLUS, NTAG_I2C_2K_PLUS 
ADD: 'hf mfu info'  ul-ev1 pwd tests are now correct
ADD: 'ul ev1 authentication' now deals with magic tags and NACK messages correct.
ADD: 'hf mfu pwdgen'  added the option 'r' to read uid from tag instead.
 2017-07-11 17:52:01 +02:00
iceman1001 683180cb60 ADD: added a simple test of known pwd algos based on uid. 2016-02-24 08:31:46 +01:00
iceman1001 dd79e03a1a ADD: a new pwdgen algo Nicknamed C, (Huge props to @Bettse for everything) also added to the "hf mfu info" command. However, that will not work given the system's lockbits.. :( Maybe I'll add a function to test all imp pwdgens given a UID without making a authentication call to tag. 
ADD:   BSWAP_32 macro, for changing endianness.
 2016-01-09 17:17:36 +01:00
iceman1001 2b1f4228c2 ADD: @marshmellow42 's changes to "hf mfu *" , 
ADD: @marshmellow42 's changes to "hf mf sim",
ADD: @pwpiwi 's parity files was missing.
 2015-12-15 09:34:55 +01:00
iceman1001 9984b1735a CHG: updated helptext for lf t55xx bruteforce 
ADD: a ROL function in util.c
ADD: two pwdgen functions in cmdhfmfu.c,  call them with a 7byte UID and get a 4byte number back. Will see if it can be connected with the "hf mfu info" command,  make data extraction easier later on.
ADD: added some more easy pwd in the dictionary file default_pwd.dic
 2015-12-02 22:46:11 +01:00
iceman1001 24344f28ad FIX: ref 2ec8773314 
@marshmellow42 's fixes for pskdemod and mfu.
 2015-06-23 19:22:40 +02:00
iceman1001 22e2470051 ADD: @marshmellow42 fudan detection in hf mfu 
ADD: @marshmellow42 14b reader changes.
ADD: @pwpiwi 14b fixes
 2015-06-21 11:07:05 +02:00
iceman1001 1c6e7f0393 ADD: @marshmellow42 's infineon MY D(tm) MOVE LEAN tag identification 2015-06-02 12:20:16 +02:00
iceman1001 bcf61bd34a Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h
 2015-05-23 08:16:40 +02:00
iceman1001 fff69a1e34 CHG: Merged the "hf mfu rdbl" and "hf mfu crdbl" commands into "hf mfu rdbl". One read command. 
CHG:  Merged the "hf mfu wrbl" and "hf mfu cwrbl" commands into "hf mfu wrbl". One write command.

Both new commands implement a help, authentication (0x1A/0x1B) for ULC and the rest,
 2015-05-20 23:44:11 +02:00
iceman1001 1fa96198bb ADD: @marshmellow42 latest fixes, 
CHG: change name to fancey "NTAG I²C 1K"
 2015-05-20 21:03:58 +02:00
marshmellow42 c7442b7673 Add NTAG i2c and bug fix 
also streamlined select tag code
 2015-05-20 14:06:46 -04:00
iceman1001 623db3559b CHG: the new NTAG_i2c_1K enums, broke the uint16_t size.. Had to go up one level. 2015-05-20 19:26:11 +02:00
iceman1001 05f7accdbb CHG: @marshmellows changes. 
ADD: NTAG i2c 1K / NTAG i2c 2K identification.
 2015-05-20 19:20:26 +02:00
marshmellow42 a383f4b708 Add ntag 210, 212, 203 and bug fix 2015-05-20 11:27:44 -04:00
iceman1001 b61e397962 ADD: NTAG_210, NTAG_212 support / identification. @marshmellow42 's idea. 2015-05-20 14:09:40 +02:00
iceman1001 593fc3c9a3 FIX: comment out a #include to reveng (my experiment) 
ADD: Started to add a NTAG203 identification.   Its a hard tag to pinpoint. Doesn't have GET_VERSION,
 2015-05-19 21:45:06 +02:00
marshmellow42 29250969b0 @iceman1001 s comments/updates mfu cmds 2015-05-18 22:07:11 -04:00
iceman1001 e7e9508883 @Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses bigbuffer now, and can dump NTAG216 :) 
Consistency on the client-side code "hf mfu".  looks nice.
 2015-05-18 20:58:33 +02:00
iceman1001 833081e3e7 add: @marshmellow changes, 
chg: remade the authentication for ULC..
 2015-05-16 15:27:53 +02:00
marshmellow42 cceabb79e6 mfu info / dump attempt at missing auths 
NOT TESTED.  will test soon.  probably has bugs!
 2015-05-16 01:00:31 -04:00
marshmellow42 a2e2bb8a15 hf mfu info - ICEMANS updates 
plus slight change to UL_EV1 auth annotation.
 2015-05-12 18:16:55 -04:00
iceman1001 98cdd56862 ADD: added option to call "hf mfu info" with a authentication key. 
ADD: added a help text for "hf mfu info"   usage_hf_mfu_info
ADD: added @marshmellows changes & fixes.
 2015-05-12 18:55:34 +02:00
marshmellow42 8ceb6b03e5 hf search - prelim - re-use hf mfu GetTagType... 
in hf 14a reader to identify UL(+)

still a work in progress.
 2015-05-12 00:19:44 -04:00
marshmellow42 75377d29d6 MFU - Icemans further improvements 
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
 2015-05-06 00:55:29 -04:00
iceman1001 2c74558d71 CHG: enhanced the "hf mfu info" a lot. It can detect UL/UL-C/UL-EV1/NTAG213/NTAG215/NTAG216 
and at present it can detect if a UL-C tag is magic (uid changeable)

FOR UL it writes the first configuration pages 0-3.
For UL_C  it tests some default 3des keys,  and lock / confg bytes at pages 42-43,44-47
For UL_EV1  / NTAG  it collects the GETVERSION command and tries to read 3 counters.,  it also tries one default password of 0xFF,0xFF,0xFF,0xFF  for the EV1 /NTAG  authentication 0x1B.

FOR UL_C_MAGIC,  it tries to see if the gatherd nonces for authentication 0x1A is the same, which indicates on my tags that they are magic.

There is the @marshmellow changes to "hf mfu dump" command.

This commit needs testing, and is to be considered experimental.
 2015-05-05 00:25:10 +02:00
iceman1001 1c1c5f4cae CHG: "hf mfu crdbl" help text, got at correct length 3des key. 
CHG: Added @marshmellows fixes for "hf mfu info"
CHG: moved some debug printandlog statements around.
 2015-05-01 15:33:54 +02:00
marshmellow42 92690507ab Iceman's updates to MFU info and dump 2015-04-30 09:28:43 -04:00
iceman1001 1ec21089b2 CHG: the work in progress of making "HF MFU INFO" / "HF MFU DUMP" goes on. 
ook @marshmellows changes and remade them a bit. TagTypeUL_t behaves like a flag-enum.
     "HF MFU DUMP" now autodetects tagtype, and the deviceside should report back proper length.
 2015-04-30 10:15:52 +02:00
marshmellow42 f168b2633b MF Ultralight - Iceman's updates + mine 
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
 2015-04-29 18:27:31 -04:00
iceman1001 a8be77afd1 CHG: re-factored the "HF MFU CAUTH" command to be simpler. 
ADD:  "HF MFU INFO",  added detection of MAGIC UL-C tags and a simple loop test 5 default 3des keys.
 2015-04-29 20:24:37 +02:00
iceman1001 0ec548dc21 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
 2015-03-24 11:45:31 +01:00
iceman1001 81740aa519 STEP 3 - the actual new files for Ultralight. 
ADD: script remagic.lua  --  a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua  - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua   -  iterates thru a lot of calls to check the new psk demods.

all new scripts implements the  "-h"  for help text.
 2015-01-20 21:29:55 +01:00
iceman1001 99a714185e CHG: Refactored the HF MFU udump/ucdump commands into one method. 2015-01-06 21:08:20 +01:00