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

144 commits

Author SHA1 Message Date
iceman1001 1e98c4621d chg: colors 2019-02-18 16:30:57 +01:00
iceman1001 20ccfb036c chg: more colors 2019-02-18 13:12:25 +01:00
iceman1001 ad72a424ef chg: use calloc 2019-01-30 21:40:50 +01:00
iceman1001 8059f533af syntax 2019-01-26 11:09:47 +01:00
iceman1001 0fb0c35308 CHG: 'mem load' - the possibility to upload default_iclass_keys.dic, default_keys.dic, default_pwd.dic to predefined flashmemory sections. These will be used in pwd / key checking algorithms on device. 
CHG: 'script run read_pwd_mem.lua' - script now can print those uploaded dictionary files.

How to upload
pm3 --> mem load f default_iclass_keys i
pm3 --> mem load f default_keys m
pm3 --> mem load f default_pwd t

How to validate / view
PM3 -->scr run read_pwd_mem -o 237568 -k 8
pm3 -->scr run read_pwd_mem -o 241664 -k 6
pm3 -->scr run read_pwd_mem -o 245760 -k 4
 2019-01-01 18:01:40 +01:00
iceman1001 1ffddb2578 CHG: 'hf mfu dump' - simplify bin saving and added JSON dump format 2018-12-13 23:34:30 +01:00
iceman1001 259dbadbe9 chg: output unified 2018-12-02 10:05:31 +01:00
merlokk 9584074c00 fix memory error 2018-11-29 22:06:49 +02:00
merlokk 4dece3e30d del line 2018-11-29 17:13:00 +02:00
merlokk efabdde248 small fixes. done 2018-11-29 17:09:37 +02:00
merlokk 6baf579fe0 hf mf cload works 2018-11-29 16:56:57 +02:00
merlokk 955ced6c28 hf mf csave works 2018-11-29 16:05:57 +02:00
merlokk 0ffddd8470 raw load file 2018-11-29 13:21:38 +02:00
merlokk 04b436ce5e del annoying comment 2018-11-27 19:44:03 +02:00
merlokk cc6cd93ea7 save raw 2018-11-14 18:11:05 +02:00
Chris 526f50aa9d fix: 'hf iclass loclass' - remove warning on gcc4.9.2 mingw. 
don't like the declaration.   mbedtls_des_context ctx_dec = {0};
chg: 'hf iclass loclass t' - added some path tests for key file.
 2018-11-14 15:11:30 +01:00
merlokk 500645badf elite_crack 2018-11-14 11:41:03 +02:00
merlokk 82b6a2cd5b ikeys 2018-11-14 11:34:20 +02:00
Chris 25b07682dc CHG: 'mem load' - adapted loading files to use new load function. 
loading binary file can be called with NULL pointer,  don't forget to free it.
 2018-11-12 22:55:19 +01:00
Chris 6a21df3443 FIX: 'hf mf cload' - showing helptext instead of loading file. 
Added support for easy loading of bin/eml files in this patch aswell.
 2018-11-12 22:17:49 +01:00
Chris 5a95cee5ed clean 2018-09-16 20:49:29 +02:00
iceman1001 939b727c42 chg: converting malloc calls -> calloc which zeros out the allocated memory 2018-05-03 19:42:16 +02:00
iceman1001 0e7d8faf59 chg: 'hf mf csave' 
chg: 'mem save'
chg: 'hf 15 dump' - no extra newline after last block in emlfile
 2018-05-03 11:02:50 +02:00
iceman1001 b279d04c85 chg: moving around includes 2018-05-02 19:37:20 +02:00
iceman1001 d9045635fb whitespace 2018-05-02 18:09:46 +02:00
iceman1001 395fd82935 add: information on loclass binary files 2018-04-05 11:41:48 +02:00
iceman1001 b5545f4c35 chg: 'trace save' - now uses fileutils.c instead. 2018-03-20 08:23:54 +01:00
Brian Pow a4fa0144eb migrate PrintfAndLog() to PrintAndLogDevice() 2018-02-22 23:17:46 +08:00
Brian Pow f0314562f7 fix typos 2018-02-22 20:47:23 +08:00
iceman1001 604aaf5356 fix: missing in header.. 2018-02-14 21:56:28 +01:00
Brian Pow 8f9c81ae81 Rename prnlog() to PrintfAndLog() 2018-02-13 00:12:50 +08:00
iceman1001 843f453491 fix: saveFileEML() does not follow blocksize. Thanks to @brainpow 
ref
271dface40
 2018-02-06 12:43:58 +01:00
iceman1001 dc25f9212f FIX: 'hf iclass sim 2' 
FIX: 'hf iclass sim 4'
FIX: 'hf iclass loclass' - this fixes the bug where loclass assumes the epurse value is all zeros, while it now should save the epurse value during the simulation if it is updated/read.

I assume a empty valid epurse, while an all zero epurse is too much easy to detect as a anomaly.
 2018-02-04 00:52:29 +01:00
iceman1001 c025e38d91 fix: remove warning.. 2018-02-02 17:32:02 +01:00
iceman1001 fff8edd815 chg: textual.. 2018-02-02 12:59:40 +01:00
iceman1001 55874d7872 chg: textual 2018-02-01 18:02:24 +01:00
iceman1001 07d51ec4a4 fix... don't even mention it... 2018-01-06 00:19:52 +01:00
iceman1001 f92a6ddf7d FIX: 'hf iclass' - sneaky fread bug. thanks to @bettse who found it 2018-01-01 14:28:53 +01:00
iceman1001 7d25ab4561 Update loclass license conditions, https://github.com/Proxmark/proxmark3/issues/527 2017-12-27 10:34:51 +01:00
iceman1001 a3ec7fd21f chg: 'hf emv' changes from @merlokk EMV4 commit 2017-12-24 10:26:47 +01:00
iceman1001 f054f5da32 CHG: gcc7 warnings accoring to PR#401 https://github.com/Proxmark/proxmark3/pull/401/files 2017-09-26 17:02:18 +02:00
iceman1001 dd870ece28 fix: 'hf iclass sim 4' array out-of-bounds write. 
chg: 'hf iclass loclass'  nice output
 2017-09-18 15:31:53 +02:00
iceman1001 a130b58c82 add: 'hf 15 dump' added save data to file. It saves two files (EML/BIN) 2017-09-06 12:55:21 +02:00
iceman1001 33a994aa3f syntax sugar 2017-08-19 16:14:30 +02:00
iceman1001 19439605d3 chg: 'hf iclass loclass' output newline. 2017-08-19 09:52:17 +02:00
iceman1001 db515ba6c4 chg: 'hf iclass sim' - turning of antenna after simulation is done. 
chg: 'hf iclass sim' - use @holiman 's 8 csn instead of the original @carl55 (15),   and a new first entry csn, to see if the old one got blacklisted.
 2017-08-18 10:23:46 +02:00
iceman1001 c96ccd9a03 more time_t issues 2017-07-28 01:42:40 +02:00
iceman1001 3d53f941aa some time_t issues 2017-07-28 01:35:49 +02:00
iceman1001 a211877853 CHG: 'script run didump' - got some remake. unfinished. 
CHG: some default keys
 2017-07-04 20:23:47 +02:00
iceman1001 197c8f3f42 CHG: syntax sugar, minor spelling mistake 2017-01-11 23:08:59 +01:00
iceman1001 9945a928c7 Syntax suger 2016-12-14 23:25:28 +01:00
iceman1001 d1e197e9ec FIX: the changes to uart.c timings seems to have fixed my problem with the pm3 device getting unresponsive. 
CHG: "script run hard"  now iterates all sectors on the tag and output the table style like "hf mf chkkey" do.
 2016-11-22 01:58:11 +01:00
iceman1001 2dcf60f3df CHG: "hf mf hardnested" - less printing 
CHG: some filehandles = NULL.
 2016-10-21 16:06:53 +02:00
iceman1001 a11ca2f305 FIX: @wllm-rbnt 's typo fixes 2016-02-12 07:37:10 +01:00
iceman1001 b112787d4f ADD: Some instructions for configure CoverityScan using alternative compiler like the ARM-NONE-EABI-GCC 
FIX: stupid clock() == -1 on systems who doesn't have it..
 2016-01-19 21:48:29 +01:00
iceman1001 841d7af0dc FIX: Coverity Scan warnings on not using the fread return value. 2016-01-19 19:52:01 +01:00
iceman1001 6b1111d7b8 FIX: Coverity, resource leak, and variable can't be negative, 2016-01-13 13:22:25 +01:00
iceman1001 7f6ccd3926 FIX: coverty scan defects. 
- bigbuf.c  is comparision correct (iLen versus numofparity)
- cmdhfepa.c  resourceleak, add a call to free
- cipherutils.c  resourceleak, added calls to free
 2016-01-08 15:28:24 +01:00
iceman1001 e98572a1e2 I just merged @marshmellow's branch "iclass" and that was a lot of new functionality. *great work* 
Things like the ICLASS, tryDecryptWord,

--
My other stuff like default keys, some new Mifare EV1 commands 0x40, 0x43 for the logging annotation,  start of the T55x7 configblock helper functionality (ripped from Adam Lauries RFIdler code)
Changes to the PCF7931 functions written,  which has a lousy input check..
 2015-10-07 23:00:46 +02:00
iceman1001 f4a57e861d Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	client/loclass/cipher.c
	client/loclass/fileutils.h
 2015-02-19 11:32:11 +01:00
Martin Holst Swende 1defcf606f More work on iclass full simulation, and some work on iclass tag dump parsing 2015-02-19 10:48:33 +01:00
Martin Holst Swende b67f7ec359 Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode 2015-02-18 20:02:44 +01:00
Martin Holst Swende 41524d8a39 Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem 2015-02-17 22:07:40 +01:00
iceman1001 64d1b4efc9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/epa.c
	armsrc/iclass.c
	armsrc/iso14443a.c
	armsrc/iso14443a.h
	armsrc/iso15693.c
	armsrc/lfops.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	armsrc/string.h
	armsrc/util.h
	bootrom/bootrom.c
	client/Makefile
	client/cmddata.c
	client/cmddata.h
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhf14b.c
	client/cmdhf15.c
	client/cmdhficlass.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/cmdlf.c
	client/cmdlfem4x.c
	client/cmdlfhid.c
	client/cmdlfhitag.c
	client/cmdlfio.c
	client/cmdmain.c
	client/data.h
	client/flash.c
	client/graph.c
	client/graph.h
	client/loclass/elite_crack.c
	client/loclass/fileutils.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/lualibs/mf_default_keys.lua
	client/lualibs/utils.lua
	client/mifarehost.c
	client/nonce2key/crapto1.c
	client/proxmark3.c
	client/scripting.c
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
	client/scripts/tracetest.lua
	common/Makefile.common
	common/cmd.c
	common/cmd.h
	common/lfdemod.c
	common/lfdemod.h
	common/usb_cdc.c
	common/usb_cdc.h
	include/usb_cmd.h
 2015-01-29 21:39:33 +01:00
Martin Holst Swende afceaf4018 Removed openssl from the mfu-stuff 2015-01-22 21:02:21 +01:00
Martin Holst Swende d60418a05f Synchronized loclass library, imported the legal warning 2015-01-15 16:30:05 +01:00
iceman1001 14edfd09c3 CHG: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. 
Minor code clean up.
Added from Pm3-master which will make this fork one step closer to Pm3-master.
 2015-01-07 22:51:34 +01:00
iceman1001 79544b28ad CHG: minor code clean up 
ADD: added some  helper-functions in util.c
 2015-01-07 20:52:03 +01:00
iceman1001 4888b28195 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-01-07 11:09:05 +01:00
Martin Holst Swende cb29e00a12 Save iclass dumps to file, like mifare-dump functionality works 2015-01-07 09:57:18 +01:00
iceman1001 10403a6a30 ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. 
ADD: added a manufacturer list for hf 14a reader,  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
 2015-01-06 11:17:02 +01:00
iceman1001 3fe4ff4f03 CHG: generic code clean up. Removal of commented code. 
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
 2015-01-05 15:51:27 +01:00
Martin Holst Swende 6f101995b6 Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests 2015-01-05 09:16:06 +01:00
iceman1001 d3a22c7dfa ADD: Holimans new changes in master. 2015-01-05 02:01:24 +01:00
iceman1001 8d0a3e87d7 FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works. 
FIX: changed the DetectASKClock in lfdemod.c to correct detect all clocks in the array.
CHG: I like code with more spaces inside of it and tried change some stuff according to our codestyle in HACKING.txt
ADD: some zero checks and overflows, god knows where it was.

The T55XX commands will be rewritten to use Marshmellows lfdemod.c instead.
CHG: Made the graph window smaller.
CHG: lf read  now does a "data samples" also.  (less writing commands)
CHG: data samples now defaults to samples size of 20000
 2015-01-04 22:49:54 +01:00
iceman1001 6ff6ade2f5 ADD: midnitesnakes desfire, ultralight changes from Unstable branch. 
ADD: Marshmellows fixes for the LF (demods) commands,  (LF SEACH)
ADD: Holimans changes with hash1_brute

FIXES:  minor fixes with some calls to "free" and redundant debug statement and code cleanup. removal of commented code.
 2014-12-31 11:35:43 +01:00
iceman1001 f5ed4d12de ADD: started with adding a LF AWID26 write function. not done yet. 
ADD: latest pwpiwi & holiman changes.
 2014-12-19 13:46:02 +01:00
Martin Holst Swende 0eea34a2a3 Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data 2014-12-18 14:41:17 +01:00
iceman1001 a501c82b19 Applied Holiman's fixes for iclass.c and CSNs 
Applied PwPiwi's new parity fix.
Applied Marshmellw's fixes for FSKdemod (HID, IO)

FIX: a potential bigbuffer fault given pwpiwi's change inside lfops.c CmdIOdemodFSK & CmdHIDdemodFSK
FIX: change some "int" parameters to uint's.
FIX: changed the lfops.c -  DoAcquisition125k_internal  to respect pwpiwi's definitions of FREE_BUFFER_OFFSET

HEADS up:  The ultralight functions hasn't been verified since pwpiwi's changes.
 2014-12-17 20:33:21 +01:00
Martin Holst Swende 6116c79618 Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0 2014-12-14 21:37:56 +01:00
iceman1001 463ca973e7 FIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to be loaded. 
FIX: hf mf esave - now supports specifying  0,1,2,4 in card memory for the file to be saved.
ADD: data.h -  added FILE_PATH_SIZE constant
ADD: hf legic load - a command help and checks for FILE_PATH_SIZE
ADD: hf legis save - now checks for FILE_PATH_SIZE
ADD: lf hitag - now checks for FILE_PATH_SIZE
ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE
ADD: data load / save  - now checks for FILE_PATH_SIZE
FIX: ui.c - added a case of closing a filehandle
FIX: hf mf cload / csave now checks for FILE_PATH_SIZE
FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE
 2014-11-16 11:22:06 +01:00
Martin Holst Swende ca4714cd23 More coverity fixes 2014-10-30 21:49:18 +01:00
iceman1001 a61b4976bd FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks. 2014-10-30 00:09:01 +01:00
Martin Holst Swende 97d582a692 More coverity findings 2014-10-27 22:33:37 +01:00
iceman1001 2ae8a312e0 Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that the sim works. 
Something about speed,  the clock detection is not so good.  should be 64,  usually 67..
 2014-10-27 19:46:21 +01:00
iceman1001 75465377b9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/iclass.c
	client/Makefile
	client/cmdhficlass.c
	client/loclass/cipher.c
	client/loclass/fileutils.c
	client/loclass/ikeys.h
	include/usb_cmd.h
 2014-09-19 10:50:34 +02:00
iceman1001 313ee67ea2 Fixed: "hf mfdes info" 2014-09-18 12:38:31 +02:00
iceman1001 f38a152863 First check in. 2014-09-11 23:23:46 +02:00
Martin Holst Swende 9b82de75f4 more work towards iclass elite dumping.. not quite finished yet though :( 2014-06-30 00:20:40 +02:00
Martin Holst Swende aa41c6058a Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo 2014-06-29 23:34:24 +02:00
Midnitesnake 74a3880283 Changes inorder for iclass dump to work correctly 2014-06-29 09:25:31 +01:00
Martin Holst Swende 3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research 
Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
 2014-06-28 20:52:37 +02:00
penturalabs fe53c0311c improved calc_iclass_mac to work independant of size 2014-05-02 23:30:03 +01:00
Andrew Davies a66fca86b9 Updated proxmark research with Holiman's loclass framework 2014-05-02 11:11:54 +01:00