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

153 commits

Author SHA1 Message Date
iceman1001
f0a5d10354 chg: 'hf iclass eload' better filename handling 2018-01-02 13:02:55 +01:00
iceman1001
fe9416db23 chg: 'hf iclass' - work in progress. running default_iclass_keys.dic against reader (pm3 as simulation) 2018-01-02 11:17:31 +01:00
iceman1001
61b8594cb4 working progress.. 2017-12-24 10:59:24 +01:00
iceman1001
d894e36b95 chg: textual 2017-12-21 14:30:24 +01:00
iceman1001
231b0df578 CHG: 'hf iclass reader' - the select / which blocks to read / before saying it succeded was corrupt 2017-12-21 13:48:06 +01:00
iceman1001
3634327bef chg: code cleaning. 2017-12-21 12:42:32 +01:00
iceman1001
5eafdbf872 ADD: 'hf iclass check' - increased speed in check keys with new algo. 
ADD: 'hf iclass' - trying to add the timeout-limits for commands in order to get a more stable iclass communication
 2017-12-21 10:13:40 +01:00
iceman1001
7aaa335ab1 chg: 'hf iclass chk' - added option E to target elite keys. added option R to interpret dictionary file as raw (diversified keys) instead. 2017-12-16 19:13:10 +01:00
iceman1001
76fc2cbc2b chg: 'hf iclass chk' - different output and break the twice-loop when found. 2017-12-15 15:37:00 +01:00
iceman1001
51d1bb2aaa chg: 'hf iclass chk' - unsigned long long. 2017-12-13 10:44:21 +01:00
iceman1001
c50c0e49d6 chg: 'hf iclass chk' - adjustments to output 2017-12-13 10:40:20 +01:00
iceman1001
0773e1a663 add: 'hf iclass chk' - iclass check keys functionality. uses input from a default_iclass_keys.dic 2017-12-13 10:18:38 +01:00
iceman1001
2f3dbbcaa3 rename: ul_switch_off_field -> DropField (inside cmdhf14a.c) 
chg:  Fix memory bounds error (@wsmoses)
 c3511781a1
 2017-11-11 23:23:01 +01: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
4e7c987cbd chg: 'hf iclass sim' not save when no mac-responses was collected. 2017-09-14 13:05:46 +02:00
iceman1001
98bc685632 add: 'hf iclass sim 4' - new mode, to adapt sim 2 to readers in keyroll mode. 2017-09-12 08:45:38 +02:00
iceman1001
45d46ab0d5 fix: 'hf iclass sim 2' - last CSN didn't seem to work. replaced it with two new ones. 2017-09-07 16:14:33 +02:00
iceman1001
2c1e2a9f3a CHG: 'hf 15 findafi' - added the possibility to cancel loop with buttonpress 2017-09-05 10:31:27 +02:00
iceman1001
c5616dfe76 minor corrections.. 2017-08-29 15:47:26 +02:00
iceman1001
94f70caa7a when you need to add too much changes at the same time... 
fix: 'hf mf hardnested'  test cases doesn't need to verify key.
add: 'hf mf ' - collect nonces from classic tag.
chg: switch_off on armside,  a more unified way,  so we don't forget to turn of the antenna ...
chg:  renamed 'hf iclass snoop'  into 'hf iclass sniff'   in an attempt to make all sniff/snoop commands only SNIFF

chg: 'standalone' ->  starting the work of moving all standalone mods into a plugin kind of style, in its own folder.
 2017-08-26 12:57:18 +02:00
iceman1001
d13bbcd466 chg: 'hf iclass sim 2' - added a new set of CSNS. 2017-08-19 16:13:36 +02:00
iceman1001
823a814cf6 FIX: some possible null - ref bugs in 'iclass' , 'iso15693' deviceside. 
FIX: 0 is not a reference.
FIX: iso15693 - wait wasn't implemented
chg: 'hf 15' getTagInfo_15 renamned.
chg: 'hf iclass loclass' some output got newline
 2017-08-19 09:49:41 +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
f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001
e8015142cd fix: TRUE/FALSE -> bools 
fix: 'iclass'  filepath 255, to use FILE_PATH_SIZE
fix: unified params test
 2017-07-14 20:54:11 +02:00
iceman1001
5f18400cbe FIX: 'hf iclass reader' marshmellows fixes. 
CHG:  removing some #define TRUE
 2017-07-07 12:38:49 +02:00
iceman1001
dd98b934bc CHG: 'hf iclass readblk' - should be able to read block 0,1 on all cards without key. 
CHG: 'hf iclass reader' -  two rules according to datasheet
  if app_limit is less than 0x6,  app_limit should be 0x6
  if app_limit is bigger than 31/0x1F on 2kb picopass,  the app_limit should be 26/0x1A
 2017-07-05 12:05:53 +02:00
Iceman
8c9facb7b5 Update cmdhficlass.c 
fix:  'hf iclass dump' now uses rawkey option even for credit key.
 2017-04-27 16:30:14 +02:00
iceman1001
9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001
ced742717d CHG: should remove a compiler warning on OSX 2017-01-23 23:12:41 +01:00
iceman1001
d3fd5fd6d8 CHG: unused variables and remove of compiler warnings. 2017-01-16 15:00:40 +01:00
iceman1001
db289ea7d7 CHG: syntax suger 2017-01-11 23:01:15 +01:00
iceman1001
042db564ba CHG: 'hf iclass replay' added help text. 
CHG: 'hf iclass snoop'  added help text.
CHG: 'hf iclass reader' added help text.
ADD: 'hf iclass reader' added the possibility to read only one tag instead of looping.
CHG: 'sprint_hex_ascii' function now replaces unprintable chars with '.',   added this call to printIclassDumpInfo
 2017-01-10 22:21:16 +01:00
iceman1001
76c74bf9ad CHG: 'hf iclass decrypt' - adjusted the loops, to only decrypt Application 1. However I've noticed not all blocks in Application 1 is encrypted. :/ Still needs to be adjusted. 
CHG: 'hf iclass reader'  - added some output accessrights from the CopyReader source code.

And ofcourse,  moved around stuff,  like the usages in cmdhficlass.c
 2017-01-10 18:23:05 +01:00
iceman1001
dd83c4572b CHG: coverity complains about not reading the value from mifare_send_short 
CHG: ubuntu 14.04 gcc4.8.4 complains about mem_avail still. Don't know why.
 2017-01-09 22:15:36 +01:00
iceman1001
f80cd7e687 syntax suger, some tabs fixed 2017-01-03 19:33:21 +01:00
Iceman
1772cf8bdd fixed warning about size_t 
CHG:  warning needs %lu string formatter
 2016-12-26 20:43:20 +01:00
Iceman
ef31a8b453 fix a warning 
CHG: size_t is unsigned. switched to the correct string formatter
 2016-12-26 20:39:13 +01:00
iceman1001
8b2a5d400a FIX: 'hf iclass dump' / 'hf iclass readtagfile' - the faulty output from these commands are now fixed. 2016-12-09 14:38:51 +01:00
iceman1001
c5af4b5d8c CHG: 'hf iclass dump' - output fixes 
CHG:  'hf iclass readtagfile' - output fixes
 2016-12-08 18:02:48 +01:00
iceman1001
a11ca2f305 FIX: @wllm-rbnt 's typo fixes 2016-02-12 07:37:10 +01:00
iceman1001
841d7af0dc FIX: Coverity Scan warnings on not using the fread return value. 2016-01-19 19:52:01 +01:00
iceman1001
67d78d0cde CHG: syntax suger 2016-01-19 19:31:34 +01:00
iceman1001
a429510647 REM: Removed #define llx PRIx64, all these defines are located in proxmark3.h 2016-01-19 16:29:07 +01:00
iceman1001
5cba446201 FIX: Coverity, uninitialized scalar variable, filename array could be NULL.. 2016-01-12 23:10:38 +01:00
iceman1001
628d1cb085 FIX: Coverity, CID #121346, resouce leak, close filehandle. 2016-01-12 23:06:53 +01:00
iceman1001
f7c30d806c FIX: Coverity, out-of-bounds, CID#121330, CID#121331, CID#121332, CID#121333, 
keyNbr has to be smaller then ICLASS_KEYS_MAX (since the Iclass_Key_Table array is initialised with it).
 2016-01-12 23:05:10 +01:00
iceman1001
3c40616979 FIX: Coverity, Dereference null return, CID #212329, filehandle could be NULL 2016-01-12 22:57:23 +01:00
iceman1001
8b15860ed1 FIX, Coverity, Unsigned compared against 0. CID #212326, keyNBr will never be negative. 2016-01-12 22:53:13 +01:00
iceman1001
ddb748a973 FIX, Coverity, Argument can't be negative, CID #212324, ftell(f) can be negative, not allowed in malloc. 2016-01-12 22:49:29 +01:00
iceman1001
4bb17c6633 FIX: Coverity , Argument can't be negative, CID #121323, ftell(f) can be negative, not allowed in malloc. 
FIX: forgot to close the filehandle :(
 2016-01-12 22:47:48 +01:00
iceman1001
9c4e28a445 FIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can be negative. Not allowed in malloc... 2016-01-12 22:43:28 +01:00
iceman1001
ab7bb49475 FIX: coverty scan reveals some resourceleaks and overruns, which is supposed to be fixed now. 
/armsrc/des.c   overflow 7 instead of 6
/client/cmdlfhitag.c  overflows traclen
/client/util.c   sprint_bin_break  overflows.
/client/cmdhficlass.c   need to free memory after malloc.

ADD:  RotateRight macro in util.h
 2016-01-08 14:25:10 +01:00
iceman1001
a7474bb30a add: added @AdamLaurie 's iclass raw keys changes 2015-12-21 19:44:47 +01:00
iceman1001
9332b857ff ADD: @marshmellow42 's fixes for Q5, t55xx, fskclock, 
ADD:  got tired of always writing wrong "hf 14a list",  so I hooked it back up to call the "hf list" with argument. Things becomes smoother that way.
 2015-12-16 11:01:46 +01:00
iceman1001
2b9006bd14 Two fixes for warnings when compiling on Ubuntu14.04. 
FIX: a wrongly set parameter call to memset in CmdT55xxWipe .
FIX: an ignored fread call in  cmdhficlass.c,
 2015-12-09 15:29:18 +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
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
8949bb5dad Added @marshmellow42 "hf search" 2015-05-13 09:13:42 +02:00
marshmellow42
6ce0e5386a HF Search - refactoring cmds to work with it 2015-05-12 16:45:48 -04:00
Martin Holst Swende
0e6c7336b0 Fixed issue with dumping iclass tags > 2KB in size 2015-04-23 09:50:44 +02:00
Martin Holst Swende
caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found 2015-03-29 21:49:58 +02: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
9a9bcea82b Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper 2015-02-17 23:17:43 +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
Martin Holst Swende
a4749080d9 Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side 2015-02-14 21:18:39 +01:00
Martin Holst Swende
534445139c Reformatted 2015-02-14 21:17:08 +01:00
Martin Holst Swende
7781a65656 Started work on 'hf iclass eload' - only client side so far, not yet supported in the device 2015-02-14 21:15:53 +01:00
Martin Holst Swende
428d622160 Fixed bug with iclass dump which prevented saving to file 2015-02-14 20:42:23 +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
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
Martin Holst Swende
4c3de57ad2 Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands 2015-01-04 21:22:54 +01:00
Martin Holst Swende
c8dd9b092e Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle 2015-01-04 14:53:26 +01:00
Martin Holst Swende
2e9d4b3ff4 Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed 2015-01-03 15:11:48 +01:00
pwpiwi
545f203826 adapted hf iclass list to new trace format 2014-12-20 21:32:44 +01:00
Martin Holst Swende
8e9768399c minor change 2014-12-18 14:46:38 +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
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
Martin Holst Swende
eabba3df7e Fix (iclass) 2014-12-14 18:07:12 +01:00
Martin Holst Swende
90e278d3da Fixed several issues found using a coverity-scan 2014-10-27 21:46:04 +01:00
Martin Holst Swende
9e28ee9f14 Only documentation and minor changes 2014-06-30 11:23:14 +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
26c0d833ac Some minor changes [iclass-related] 2014-06-28 22:57:48 +02: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
Martin Holst Swende
77abe781af fix for better csns 2014-06-27 12:52:28 +02:00
penturalabs
fecd8202a5 implemented 'hf iclass dump xxxx', 
all you need is the magic key to dump contents of an iclass card
 2014-06-17 10:55:37 +01:00
Martin Holst Swende
9f6e9d1575 More work on iclass simulation attack 2014-06-16 21:27:12 +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
Martin Holst Swende
f83cc12613 More work on iclass 2014-04-24 15:48:00 +02:00
Martin Holst Swende
17cba2693d Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping 2014-04-24 14:13:33 +02:00
penturalabs
c3963755b7 Implement replay command. 2014-04-15 11:47:01 +01:00
roel@libnfc.org
28fdb04fd8 Finally, rewrote bootrom and flasher program, much faster now 2013-02-28 15:11:52 +00:00
roel@libnfc.org
902cb3c00b major USB update 2012-12-04 23:39:18 +00:00
roel@libnfc.org
db09cb3adb MAJOR update, added hitag2 reader, emulation and eavesdropping, lots of new code, including FPGA tweaks 2012-09-18 13:52:50 +00:00