Commit graph

208 commits

Author SHA1 Message Date
iceman1001 cd0bed3c98 FIX: textual fix 2016-02-22 17:51:07 +01:00
iceman1001 0516439959 ADD: Added @marshmellow42 's new ST (sequence terminator detection) 2016-02-19 22:30:19 +01:00
iceman1001 07f970aad7 chg: ego credits....one of these days I'll remove 'em 2016-02-18 17:48:17 +01:00
iceman1001 1d5464397c ADD: first try to implement crc-16 for Legic Advant *not working yet* Can't verify it. 2016-02-16 10:44:12 +01:00
iceman1001 4469412e88 ADD: adding a presco demod, given 0x10D as preamble, .. *work in progress* 2016-02-14 11:58:25 +01:00
iceman1001 6bb7609cad CHG: had to move the SwapBits method. 2016-02-12 16:19:18 +01:00
iceman1001 6b6815bccb CHG: extracted a #define for the crc16 poly 2016-02-12 12:34:54 +01:00
iceman1001 ee4e281675 FIX: legic_prng.c according to user on forum ref: http://www.proxmark.org/forum/viewtopic.php?pid=5437#p5437 needs to be "& 0x7F"
ADD:  method for calculating the storage crc8.
2016-02-12 12:34:05 +01:00
iceman1001 a11ca2f305 FIX: @wllm-rbnt 's typo fixes 2016-02-12 07:37:10 +01:00
iceman1001 df4ee66ea9 CHG: my idea of malloc and free for bucketsort didn't work so well. Back to the original. 2016-02-10 21:44:32 +01:00
iceman1001 089d061f2d CHG: Extracted @piwi's bucketsort into separate files under /common 2016-02-10 13:09:33 +01:00
iceman1001 b351374ca8 CHG: Reversed @piwi 's changes to parity. I'm getting assembler compiler errors. 2016-01-16 23:05:21 +01:00
iceman1001 a531720ae6 added @pwpiwi 's latest changes to "hf mf hardnested" 2016-01-03 17:16:50 +01:00
iceman1001 08e11f0a90 REM: removed an offensive #include on archlinux. Compiles on mingw without. 2015-12-23 23:26:03 +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 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 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 bf32dd923f ADD: @marshmello42 's fixes for low frequency demodulation lengths greater the 512bits. 2015-12-09 14:58:16 +01:00
iceman1001 0a886a1d1b ADD: a TEA crypto algorithm implemention. 2015-12-09 14:57:16 +01:00
iceman1001 8ce3e4b4e9 add: missing two hard_nested files.. 2015-12-02 16:48:25 +01:00
iceman1001 c188b1b9b2 ADD: @go_tus simple bruteforce for t55xx, refactored a bit.
ADD: @pwpiwi 's implementation of Hardnested
2015-11-27 16:24:00 +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 6426f6ba86 @marshmellows last LF changes.
- wipe a t55x7 tag
- stable demods
-
2015-11-20 16:56:43 +01:00
iceman1001 57c7b44be5 FIX: some fixes to indalademod and viking from @marshmellow42 2015-11-10 18:56:43 +01:00
iceman1001 70459879e9 added @marshmellows new viking demod.
adjusted it to fit with the clone/demod  that is under  "lf viking" commands.

did some code clean up,  3spaces into tab.
2015-11-10 11:42:59 +01:00
iceman1001 c2731f37be CHG: a major remake of the "hf mf c*" commands. Ie chinese magic tags. Tried to make them consistent in parameter calls and simplified. And fixed the annoying gen1 tags that answers with a ACK/NACK on HALT commands.. 2015-11-09 21:46:15 +01:00
iceman1001 94422fa23f ADD: @marshmellow42 's fixex and resetread t55x7 2015-11-02 20:46:17 +01:00
iceman1001 857bc2ff6a CHG: some desfire changes from @bforbort fork. *untested* 2015-10-30 09:09:35 +01:00
iceman1001 1d0ccbe04b ADD: added the "hf snoop" patch original from @Enio, rearranged by @Etmatrix.
ADD:  added the "t55x7" refactoring by @marshmellow42
2015-10-27 21:47:21 +01:00
iceman1001 ac2df3460a ADD: @marshmellows fixes for t55x7 reading signal.
ADD: @marshmellows "diphase" definition for T55x7.
MOV: extracted the aquisition from the t55x7 methods and put them inside lfsampling.c
FIX: pcf7931 write,   there is 16bytes in a block.. not 4 as I thought before.
FIX: t55x7 lowered the WRITE_0 to 16.  Even bigger gap.
2015-10-15 10:23:15 +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 0de8e3874d A lot of changes...
.. ntag simulation stuff from @marshmellows branch "ntag/sim"
.. hf mf mifare fixes from @pwpivi.
.. hw status command
.. speedtest function from @pwpivi
.. Viking Functionalities,   (not a proper DEMOD, but a start)
.. GetCountUS  better precision from @pwpivi
.. bin2hex,  hex2bin  from @holiman

...
starting with getting the T55x7 CONFIGURATION_BLOCK for different clone situations. Ripped from Adam Lauries RFidler,   nothing working or finished..
...
Started working with the T55x7 read command with password actually performs a write block...  See Issue #136  https://github.com/Proxmark/proxmark3/issues/136    Not solved yet.

...
Started add SHA256..   not working yet..
2015-10-04 18:01:33 +02:00
iceman1001 a82c1ac827 FIX: A old bug regarding: CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K command, where it causes the USB_COMMAND_BUFFER to overfill is corrected. The message: "WARNING: Command buffer about to overwrite command! This needs to be fixed!" was showing when it happens.
The solution is not to add the CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K  to the storeCommand function.
2015-07-31 18:48:58 +02:00
iceman1001 f62b5e1204 added @piwi 's usb speed test.
.. found out that my usb speed is really slow.  Started to look for reasons. Have a win7 64 env, running on a vmware image.
2015-07-31 10:37:24 +02:00
iceman1001 7838f4beba MERGED: @holimans changes
MERGED: @piwi changes
MERGED: @marshmellows changes.

I'm not even gonna try write up all that stuff..

ADD: changed some commands inside the "Hf 14a sim" on deviceside.
ADD: @mobeius "two nonce" version for mfkey32.   It is also inside the "hf 14a sim" with the "x" parameter.
2015-07-22 23:00:52 +02:00
iceman1001 c5f8c67ab4 ADD: ISO7816-4 annotation in "hf list".
Only basic 7816 command apdu supported. USAGE::"hf list 7816"
2015-07-17 21:56:00 +02:00
iceman1001 9783989b40 ADD: pwpiwi 's FPGA compress 2015-06-25 12:22:34 +02:00
iceman1001 569009f3f7 ADD: @pwpiwi 's fix 50365fedcb 2015-06-18 13:51:00 +02:00
iceman1001 a71ece51e4 ADD: iso11784/85 FDX-B
ADD: the source from RevEng 1.30, got into the PM3 client.
2015-06-07 11:35:49 +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 0df669a298 ADD: next step ISO11784/85 2015-06-03 21:35:03 +02:00
iceman1001 615f21dde2 FIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase.
ADD: started witha  ISO11784/85 demod function.
2015-06-03 21:12:24 +02:00
iceman1001 ea75b30c81 ADD: SHA1 hashes calculations in sha1.c and LUA 2015-05-26 16:12:33 +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
marshmellow42 a98b05b71d missed file in previous commit...
duh...
2015-05-19 15:03:35 -04:00
marshmellow42 d730878d8c scripting updates from @iceman1001
it compiles but i'm not sure how to fully test it...
:)
2015-05-13 21:14:35 -04:00
iceman1001 2c39c25c67 Minor clean ups 2015-05-13 09:06:47 +02:00
iceman1001 aebe77905b CHG: extracted the UL_C & UL magic tests.
ADD: a raw write command also there.
CHG: "hf mfu info" got some more love,  looks better too.
      UL_EV1 / NTAG,  only try known passwords if AUTHLIM is set to 0.
2015-05-06 22:40:46 +02:00
iceman1001 7d010c4991 chg: minor spelling change from MIFARE_ULEV1_VERS -> MIFARE_ULEV1_VERSION 2015-05-05 00:37:13 +02:00
iceman1001 11b1e2e506 ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation 2015-04-26 18:03:21 +02:00