RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 10:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity
5544 commits 3 branches 15 tags 87 MiB
Commit graph

129 commits

Author SHA1 Message Date
iceman1001
734ca940e9 fix: unified lf clone printouts of blocks. 2017-08-11 11:38:54 +02:00
iceman1001
bd4d1ec74e Fixes: lf simpsk - make sure Carrier input is ok. 
fix: 'lf awid sim' - Clk param is used CorreCt
fix: 'lf HID sim' - unified way logging
fix: 'lf indala sim' - adding a draft simulation Command
fix: 'lf io sim'  - unified way logging
fix: 'lf nedap sim' - getting bits is wrong still..
fix: 'lf paradox sim'  - Helptext
lfdemod.C  got some reworked loops,  still some debug messages to be ...
 2017-08-10 14:19:57 +02:00
iceman1001
e598aec890 lf t55xx commands works again. Need to find a better sprinf_bin_break function 2017-07-31 15:12:38 +02:00
iceman1001
91898babc0 FIX: data plot AutoCorrelate slider, window too big, now limited to number of samples. 
enhanced debugstatements,
'lf em 410x_demod' vs 'lf em 410x_read'   now read does the same as all other LF,  and demod too...
 2017-07-30 21:21:02 +02:00
iceman1001
f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001
86237b629f some more adjustments 2017-07-27 23:00:49 +02:00
iceman1001
8f262aa1bf ADD: num_CPUs(void) method from pm3 master 
CHG: clean up in util.c
ADD: seems like mingw doesn't have scandir. Had to add one. *untested*
 2017-07-27 09:36:16 +02:00
iceman1001
86bbd8f563 ADD: param_getlength , gets the string length of one parameter 2017-07-26 18:17:20 +02:00
iceman1001
6c4d1560e9 ADD: 'script list' - now sorts the scripts in alphabetic order. It needs the extra define, in order to scandir and alphasort to work. 
and this made our own version of le32toh function complain.  So this is removed from util.c and where it was used a new define replaced it (LE32TOH)
 2017-07-23 10:24:30 +02:00
iceman1001
478b9c7270 chg: some reorder, renaming 2017-07-17 14:28:57 +02:00
iceman1001
310d0da9a4 fixes.. to bool 2017-07-11 18:31:10 +02:00
angelsl
396772c93a Fixes for compiling on Android 2017-03-30 01:41:07 +08:00
iceman1001
9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001
2839f12e86 FIX: some compiler warnings, sscanf is using unsigned int. 2017-02-13 11:01:32 +01:00
iceman1001
f56b1fae2d FIX: sprint_bin_break didn't print the last digit in array. 2017-01-17 22:58:16 +01:00
iceman1001
1cc80785e5 ADD: sprint_ascii function. 2017-01-16 14:47:24 +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
Michael Farrell
faad338efe Fix some missing include statements which impact using proxmark3 client as a library. 2016-12-23 17:35:50 +10:00
iceman1001
7d159efe40 FIX: & 0xFF instead of uint8_t 2016-11-16 18:38:15 +01:00
iceman1001
1ca5dce0f4 FIX: removed some warnings about time_t in non-windows systems. This appeared since I fiddled in proxmark.h 2016-11-16 18:36:21 +01:00
iceman1001
2dcf60f3df CHG: "hf mf hardnested" - less printing 
CHG: some filehandles = NULL.
 2016-10-21 16:06:53 +02:00
iceman1001
76471e5d17 CHG: reverted back from the idea of measureing in (us) microseconds, the timer is too raw, gives 10-15us delays. Now we are measuring ticks, which is (1 us = 1.5ticks) 
like it was before.   ie:  80us = 80*1.5 = 120ticks.
 2016-09-11 11:14:12 +02:00
Alexis Green
3f5bcc3b92 FIX: CoverityScan 121362 - Pointer to local outside scope 2016-08-02 16:12:44 -07:00
iceman1001
dae31af21e ADD: Binary Encoded Digit -> Decimal 
ADD: Decimal -> Binary Encoded Digit

Ie
  decimal 2345 becomes 0x2345
  and
  hex 0x2345 becomes decimal 2345
 2016-07-29 23:29:37 +02:00
iceman1001
ddbe76d3c6 CHG: redundant 'return' statement removed 2016-07-29 14:32:13 +02:00
iceman1001
3e134b4c20 CHG: merged the forum user @jason 's fixes to LEGIC. *UNTESTED* 
CHG: changed the CRC implementations.
 2016-07-28 21:41:44 +02:00
iceman1001
1f1d974f02 CHG: added a comment 2016-07-23 18:33:30 +02:00
iceman1001
c805748f34 ADD: added a method for le32toh. Converting bytes to uint32_t . 
CHG: correct use of FILE_PATH_SIZE in the tracelogging functions.
 2016-04-18 13:05:35 +02:00
iceman1001
0d2c590974 ADD: num_to_bytebitsLSBF function. 
ADD: lf guard clone - works...  needs some checking.
ADD: added a option to "addparity" to set zero on fixed pos.
 2016-02-28 22:43:21 +01:00
iceman1001
581b31fb8a FIX: "LF PYRAMID CLONE" now works. 2016-02-26 22:10:27 +01:00
iceman1001
0516439959 ADD: Added @marshmellow42 's new ST (sequence terminator detection) 2016-02-19 22:30:19 +01:00
iceman1001
a1689f417f CHG: print_hex_break now prints rownumber instead of byte position 2016-02-16 21:39:25 +01:00
iceman1001
f7f844d0ba CHG: added timeouts for downloading values from device, to make the client more responsive. 
CHG: still curious for the printf_hex_breaks method, why it behavies strange.
 2016-02-16 10:54:41 +01:00
iceman1001
a182a680b0 ADD: a print_hex_break function, 
CHG: "hf legic decode" looks better.
 2016-02-15 22:05:26 +01:00
iceman1001
9827020ac5 CHG: "hf legic decode" now prints nicely. Still a strange bug for first row.. 2016-02-15 19:56:08 +01:00
iceman1001
6bb7609cad CHG: had to move the SwapBits method. 2016-02-12 16:19:18 +01:00
iceman1001
d04b71c168 FIX: tcgetattr for Linux in Ukbhit(), should return -1 if fail. 2016-01-13 00:14:08 +01:00
iceman1001
f37fe8cb10 FIX: Coverity, Unchecked return value, CID #121288, lets do the same check that is everywhere is this call is used. 2016-01-13 00:08:23 +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
f4d0ffd1b9 CHG: some textual change to README.txt 
ADD: a prng.c to collect some different PRNG's i've ran into
ADD: some changes the tea implementation
ADD: a enhanced version - SwapEndian64ex
 2015-12-21 19:48:00 +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
508b37ba9c REM: removed an unused doublett function "printBits" in util.c 
ADD:  added a new string helper function "sprint_hex_ascii" in util.c
ADD:  added "LF AWID BRUTE", a very simple bruteforce command for the awid commands.
      it takes a facility-code,  and iterates all possible 0xFFFF cardnum by sending sim command. It also uses the usb_poll function to stop the bruteforce on keypress and not leaving the pm3 device running the simulation.
the command implements the help parameter.
 2015-12-14 22:50:54 +01:00
iceman1001
0c97a4562d ADD: @marshmellow42 's fixes to cmdlft55xx.c (save_restoreGB) 
ADD: started with a skeleton method for printing  hex and ascill.
 2015-12-10 10:30:13 +01:00
iceman1001
bf32dd923f ADD: @marshmello42 's fixes for low frequency demodulation lengths greater the 512bits. 2015-12-09 14:58:16 +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
a126332a7b ADD: @marshmellow's fixes to awid, viking and T55x7 
ADD: 'lf t55xx detect' now can be called with a password.
ADD: trying to add the read counter and increase counter commands for ntag sim.
 2015-11-22 17:33:41 +01:00
iceman1001
3bc7b13d23 ADD: @marshmellow42's decrypt crypto-1 method, 
ADD:  @piwi's latest commit to PM3 Master, aiming at the WDR in "hf mf mifare".
 2015-10-11 09:07:29 +02: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
60e8657796 CHG: all @marshmellow42 's changes to make the reveng work. 
ADD: lua script test for using the reveng inside lua.  *prove of concept*
      it implements -h help
                    -d  data in a hexstring
                    -w  width of the crc family. (ie 16 gives all CRC-16 calculations.
     it iterates thru all found crc presets in a crc family based on the width of crc.  It calcs crc and the reverse crc.
 2015-06-09 13:31:53 +02:00
iceman1001
ad6219fc91 ADD: @marshmellow42 's fixed version of the ISO11784 FDX-B 
ADD: crc16_ccitt_rev  (reverse version of crc16_ccitt 0x0000)
 2015-06-04 10:33:55 +02:00
iceman1001
c3c241f389 CHG: moved a xor function into util.c 
CHG: added some calls to clearCommandBuffer() in /hf mfu/hf 14a sim/hf mf sim/ commands.
CHG: minor adjustments to relative pathing.
 2015-05-26 11:04:57 +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
224e8c1a4d ADD: @marshmellows fixes 2015-05-13 20:16:18 +02:00
marshmellow42
e6432f0579 @iceman1001 s coverity scan fixes 2015-05-13 11:14:17 -04:00
marshmellow42
2b3af97df2 various bug fixes 2015-05-13 11:07:47 -04:00
iceman1001
664bb5ae72 BUGS: more Coverity scan fixes. 2015-05-13 14:08:59 +02:00
marshmellow42
c585a5cf0b further MFU info updates (mainly icemans) 2015-05-06 22:15:41 -04:00
iceman1001
334cc089c9 CHG: clearing a char array before using. 2015-05-06 22:41:40 +02:00
iceman1001
e1c88b0965 ADD: @marshmellows changes 2015-05-05 00:26:17 +02:00
marshmellow42
f9848fd647 MFU dump UL-C with key 
adding UL-C auth and keys to dump cmd
swapped endian for input of hf mfu crdbl to match output of hf mfu info
cmd and tag info app
 2015-05-03 23:17:11 -04:00
marshmellow42
2767fc0291 lf cleaning 
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
 2015-04-05 00:58:57 -04:00
Martin Holst Swende
699bb9dc27 Removed some dev- printouts 2015-02-13 19:59:28 +01:00
Martin Holst Swende
31abe49fd3 Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call 2015-01-30 23:03:44 +01:00
Martin Holst Swende
f6d9fb173f Added client-side support for recording longer samples, fixed last (?) issues on device-side 2015-01-29 00:57:22 +01:00
iceman1001
b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K" 
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua  script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
 2015-01-07 22:00:29 +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
roel@libnfc.org
6c6d1ac1a6 fixed signed/unsigned problem 2013-03-26 20:42:18 +00:00
roel@libnfc.org
cb64309e4b compiling on windows again 2013-02-28 21:36:09 +00:00
Merlokbr@gmail.com
e0c635d19c hf mf sniff - working with emulator files 2012-07-17 11:28:12 +00:00
Merlokbr@gmail.com
55acbb2a39 improved command hf mf sniff. Now it cant decode nested authentication and cant write emulator files 2012-07-16 14:49:51 +00:00
roel@libnfc.org
81cd0474cb fixed a lot of simulation issues 2012-06-29 10:24:05 +00:00
douniwan5788
aea4d76687 Enhanced hf mf chk , add default key,support dic file and so on. 
modify hf mf mifare to automatically use an invalid key'nt try again.
make some changes to support mifare classic 4k.
 2012-05-30 03:45:55 +00:00
roel@libnfc.org
38c4979dae fix compiling under MAC OSX 2011-09-05 11:44:45 +00:00
Merlokbr@gmail.com
9ca155ba44 0. its alpha version!!! 
1. commands changed from "hf 14a" to "hf mf" 
2. some code cleaning and small bugfixes
3. alpha version hf mf sim
4. added internal function GetTickCount() for time measuring
 2011-06-10 13:35:10 +00:00
Merlokbr@gmail.com
873014de8a linux patch by Wil 
http://www.proxmark.org/forum/profile.php?id=1639
 2011-06-07 14:30:07 +00:00
Merlokbr@gmail.com
f397b5cc87 1. fixed hf 14a mifare. added functionality to ignore one Nt 
2. completed hf 14a nested
3. added hf 14a chk to check keys
5. added check keys to hf 14a mifare and hf 14a nested
6. added debug level to mifare commands
7. small bugs and improvements
 2011-06-07 12:35:52 +00:00
Merlokbr@gmail.com
f89c705002 improved version of "hf 14a mifare" command 
with merge with utility nonce2key
 2011-05-31 11:31:20 +00:00
Merlokbr@gmail.com
20f9a2a1d5 1. Mifare read block command 
2. Mifare read sector (via 1)
3. Mifare write block
4. fixed several bugs in iso 14443 select
added
Issue 23
Issue 26
 2011-05-26 12:55:15 +00:00
adam@algroup.co.uk
534983d735 iso14a reader patches [Hagen Fritsch] 2010-07-13 13:39:30 +00:00