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

212 commits

Author SHA1 Message Date
iceman1001 79494182cd chg: 'script run mifare_autopwn' - added a option to use a key. 2017-12-10 09:05:30 +01:00
iceman1001 2fffe96773 chg: added the append_Crc option 2017-12-05 23:41:04 +01:00
iceman1001 c4b73c8737 chg: better debugging functions. 2017-12-03 15:24:24 +01:00
iceman1001 d54bb4ddf4 chg: skip if not debug 2017-12-02 18:59:47 +01:00
iceman1001 81ccfa734e add: 'script run brutesim' - new script to show simple bruteforce by incrementing cardnumber against different readers. Both LF & HF. @kenzycarey 
(adjusted to fit into same script structure like the rest in iceman fork)
 2017-11-25 07:58:56 +01:00
iceman1001 de5b06c3d3 rem: outdated script 2017-11-05 17:44:41 +01:00
iceman1001 feea1a45d9 FIX: 'script run legic_clone' - correct getoptions pattern 2017-10-05 17:34:33 +02:00
iceman1001 5eb6836587 fix: 'script run 14araw' - correct getoptions pattern. 2017-10-05 17:32:20 +02:00
iceman1001 9701643fdd CHG: NO_RATS adjustments to luascripts. 2017-10-05 16:17:09 +02:00
iceman1001 26e6e269d1 chg: 'script run 14araw' got some local functions now 2017-09-04 22:49:33 +02:00
iceman1001 6bae0b8590 chg: 'script run formatMifare' - added the 'x' parameter. when using this parameter, the generated commands will also be EXECUTED against your card. This will wipe your card. 2017-08-28 17:35:50 +02:00
iceman1001 fec33d7d74 CHG: 'script run calc_di' - added the possibilty to write to binary file :) 
CHG: 'script run calc_mizip' - added the possibilty to write to binary file :)
 2017-08-15 22:01:44 +02:00
iceman1001 926277507a chg: added the possibility to read tag.uid 2017-08-15 21:23:55 +02:00
iceman1001 b3d0bf697a some output 2017-08-15 15:12:56 +02:00
iceman1001 c37d2d84c7 another helper 2017-08-15 15:11:57 +02:00
iceman1001 69c8970201 FIX: https://github.com/iceman1001/proxmark3/issues/122 
this should fix the ~ (tilde) bug I introduced...

In lua,  you need to evaluate false ie;   statement == false,    not like in C-style  ~statement
 2017-08-13 15:06:30 +02:00
iceman1001 3c2fa8d4f3 chg: better text 2017-07-31 15:58:14 +02:00
iceman1001 6df9012de5 chg: 'script run mifare_autopwn' added the prng_test, to make sure it only attacks weak cards. 2017-07-31 15:53:26 +02:00
iceman1001 b31fd98055 CHG: correct texts, changes to local functions 2017-07-31 15:26:53 +02:00
iceman1001 0e31ed346a minor adjustments.. 2017-07-30 11:15:48 +02:00
iceman1001 f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001 a8569849d6 part of monstermerge.. 2017-07-27 20:58:59 +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 b149fdc67b FIX: 'script run mifare_autopwn' some print statements 
FIX: 'script run mfkeys'  correct author,  added copyright
 2017-07-24 13:00:40 +02:00
iceman1001 c4c3bedb8a FIX: 'script run mfkeys' Script was mistakingly only checked first testkeys block with 85 keys. Since the selection in testkeys list was not taking lua way of ranges, it only sent zeros. 2017-07-22 14:02:51 +02:00
iceman1001 72f6ed45eb FIX: 'script run formatMifare' https://github.com/Proxmark/proxmark3/pull/362 bad comparision value 2017-07-22 14:00:54 +02:00
iceman1001 ed54dc8e17 FIX: 'dumptoemul.lua' doesn't add the last newline in generated eml file. 
FIX:  'dumptoemul-mfu.lua' doesn't add the last newline in generated eml file.
FIX:  'dumptoemul-mfu.lua' correctly gets the UID from bin file,  previously took wrong data.
 2017-07-11 19:37:59 +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 de048b0436 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2017-06-09 14:49:35 +02:00
BOURDY Romain bf413f1b87 Start fixing legic.lua ! Now loads dumps fine 2017-05-17 18:52:30 +02:00
iceman1001 e093a375ef CHG: added key gen algo. removed inparameter. 2017-04-29 01:08:19 +02:00
iceman1001 2d0341403e ADD: script to change uid on a UL magic tag which uses backdoor commands 2017-04-20 15:29:45 +02:00
iceman1001 b9534ca070 FIX: introduced a bug in luascripts when adding the "safe ascii chars" to ConvertHexToAscii. Now its optional. 2017-03-09 10:26:01 +01:00
iceman1001 57778a4630 CHG: renamed struct sector -> sector_t 
CHG: defines on armside
CHG: #define WIN32 ->  _WIN32
CHG: started to enhance "hf mf chkkeys"
REM: removed some duplicates etc in default keys.
 2017-03-06 19:11:08 +01:00
iceman1001 dd015c5915 ADD: 'script runt remagic' - the Mifare Classic s50 (1k) magic tag restores now also all sector trailers. Default A/B keys is 0xFFFFFFFFFFFF. 2017-02-14 15:54:10 +01:00
iceman1001 1cec48cc0e ADD: added the writedumpfile function from "14araw.lua" into utils.lua 
ADD: `ufodump.lua` - added the Aztek dump script. Since its an unknown tag hence the name.
 2017-01-30 16:51:07 +01:00
iceman1001 e069d740e3 still wrong... 2017-01-25 08:40:55 +01:00
iceman1001 4431b482d7 CHG:forget the "base".. 2017-01-25 08:36:51 +01:00
iceman1001 f364f71294 chg: known key is treated as a string. 2017-01-25 01:11:34 +01:00
iceman1001 b946d5f7f9 ADD: 'script run hard_autopwn' - a lua script which should run hardnested attack against all sectore and keytypes (A|B). 2017-01-25 00:23:13 +01:00
iceman1001 b7f40ee2ad CHG: added a check if err variable is NIL. 2016-11-22 11:55:23 +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 e108a48ac4 ADD: added the 'hf mf hardnested' to be called within LUA scripts. 
ADD: 'script run hard' - a first try for a lua script to run the hardnested attack on a complete tag.
 2016-11-21 16:08:12 +01:00
iceman1001 100fe0a5ee textual suger 2016-10-19 21:26:56 +02:00
iceman1001 62254ea5a7 FIX: Since some changes in "hf mf chk" usbcommand package, this script has not been working. It now calls and gets the results back from the device. 
CHG: changed the output listing to look like the other key-tables.
 2016-10-17 17:20:33 +02:00
iceman1001 b62cbadb61 CHG: fixes to match the new arguments to the darkside attack (keytype A|B and blocknumber) in mifare_autopwn.lua script. 2016-08-07 21:19:11 +02:00
iceman1001 fa5118e730 CHG: some calyspo stuff 2016-08-04 21:57:40 +02:00
iceman1001 e0530dbcec Applied @icsom 's fixes from: b577582490 2016-06-22 09:33:21 +02:00
iceman1001 3c61ee4338 chg: added to print the author. 2016-06-20 13:31:51 +02:00
iceman1001 6648776f2a CHG: added the possibility to "remagic" the new found Mifare Ultralight tags, which answers to chinese backdoor commands for uid change. 
The script now deals with to different kind of tags.  Mifare Classic 1k gen1  and  Mifare Ultralight gen1 (7bytes uid)

-Classic will get    UID: 01 02 03 04
-Ultralight will get UID: 53 80 71 02 00 D9 80
 2016-05-15 19:27:04 +02:00
iceman1001 8085377413 CHG: output when finding key it the same as from the client. 2016-05-10 07:51:05 +02:00
iceman1001 fed1227777 CHG: just made the autopwn script main loop a bit more verbal 2016-05-10 07:40:27 +02:00
iceman1001 e75bc417f1 ADD: added a lua script which calculates mifare keys based on a uid diversification 2016-05-06 10:19:15 +02:00
iceman1001 ffeb77fdc6 CHG: the 14b is getting better, since I added the fpga waiting signaling I found in "14a emgetcmd" etc. 2016-04-29 22:23:32 +02:00
iceman1001 12b998cbd8 ADD; Some 7816 error codes 2016-04-05 04:46:25 +02:00
iceman1001 ab6d8a4c47 CHG: fixed the commands, its now valid calypso 7816 commands. 2016-03-21 22:06:51 +01:00
iceman1001 4bf0f73d76 increased a number of calypso commands for selecting files and trying to read them 2016-03-20 21:30:40 +01:00
iceman1001 452aab1e59 ADD; first try at reading calypso tags 2016-03-20 20:22:35 +01:00
iceman1001 790e8eae09 ADD: @icsom changes and additions to lua scripts for LEGIC 2016-03-20 19:25:48 +01:00
iceman1001 4e8fa8b448 ADD: get a updated script from @icsom 2016-03-06 13:26:13 +01:00
iceman1001 7f0cb92e0d CHG: Added @icsom 's changes to his legic.lua script. 2016-03-01 07:07:56 +01:00
iceman1001 733eb42022 ADD: Added three legic luascript from @iscom (Mosic) Great work! 2016-02-28 14:50:49 +01:00
iceman1001 8977988fb6 FIX: forgot a lua object for the call to ConvertAsciiToHex. Thanks @romaric for finding it. 2016-01-15 21:47:32 +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 84f9cf0626 ADD: a minor xor script 2015-10-30 09:07:04 +01:00
iceman1001 a826cb0df1 FIX: tnp3sim, now can insert keys if the dumpfile is blank. Like the ,,,lander dumps... 2015-10-19 22:39:08 +02:00
iceman1001 f14c9bf915 FIX: "abort trap 6" error when runing the tnp3sim.lua script was because the CMD_MIFARE_EML_MEMSET needs to sent the bytewitdh now with recent changes in code to deal with different sizes in emulatormemory. the third argument should be 16 instead of 0. 2015-10-17 14:35:04 +02:00
iceman1001 d8a3b6c117 FIX: @tony pointed out that there was a method name lost... its been reinstated :) 2015-10-17 14:16:42 +02:00
iceman1001 a739812e89 FIX: thanks @tony, for pointing out a "end" statement inside tnp3sim.lua 
ADD: @marshmello42 fixs for t55x7
 2015-10-16 23:16:46 +02: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 f3cfe428f8 ADD: fixed some spelling misstakes in luascript. 
ADD: fixed some spelling misstakes in "hf mfu eload" help
 2015-10-05 21:25:00 +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 5de79e20f1 MOD:: reverse back changes to 14443b.c 
ADD: the hid-flasher/usb_cmd.h  wasn't up to date with how it's other file /common/usb_cmd.h looks like.
ADD: utils.lua  14443v crc inside LUA.
ADD: utils.lua  ConvertAsciiToHex method and minor adjustments checks.
 2015-07-28 21:33:09 +02:00
iceman1001 3b4fa54235 REM: Remove a double pasted section of local variables. 2015-07-24 20:34:31 +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 c043981c04 chg: added some more outputs to the reveng-crc script e.lua ... now shows -b -B -l -L also in columns. You'll need to read the reveng -h helptext to understand. 2015-06-14 17:19:41 +02:00
iceman1001 68ff832584 fix: nice output.. 2015-06-09 21:46:22 +02:00
iceman1001 d352146782 CHG: minor layout and call fixes to e.lua (the test script for hooking up reveng1.30) 2015-06-09 21:28:06 +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 d31d3804fe CHG: help text output was not aligned because of tabs/spaces 2015-06-02 12:18:54 +02:00
iceman1001 af3b8b2dc6 CHG: remade selftest structure 
CHG: removed debugstatements
 2015-05-31 22:33:12 +02:00
iceman1001 7142c87e1f ADD: a script to dump a specific type of Mifare Mini tags. 2015-05-31 21:46:25 +02:00
iceman1001 46cd801c5a FIX: dumptoemul.lua removed the extra linebreak in the end, making some load commands complain. 
MOV: moved the try32/try64 attacks (mfkey32/mfkey64) into the nonce2key.c file
CHG: added @marshmellow42 changes to hf mfu dump layout.
ADD: an extra call to BigBuf_free in readcard..  just to make sure that it doesn't leak memory.
ADD: expermimental call to "try32" for "hf mf sim x".
 2015-05-25 13:10:55 +02:00
iceman1001 f288cb607f ADD: added a List parameter to tnp3clone.lua script. 2015-05-11 19:38:53 +02:00
iceman1001 fb2d24882e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
 2015-04-24 19:04:01 +02:00
iceman1001 1b3c567df2 ADD: charatect name, level, sequence number, 
CHG: minor code clean up.
 2015-04-24 18:37:40 +02:00
iceman1001 0beb94e67b CHG: some minor code cleanup. 2015-04-24 18:36:11 +02:00
iceman1001 bb84c38196 ADD: found another sub-type, 2015-04-24 18:35:09 +02:00
marshmellow42 8e0cf02308 minor change to lf em4x menu & iceman script... 
...updates
 2015-04-10 00:06:59 -04:00
iceman1001 9c09e006d6 CHG: removed unused code. 
FIX: moved some checks to make the script run a tad bit faster.
 2015-04-09 20:38:38 +02:00
iceman1001 26b8f38b63 CHG: changed some help texts. 2015-04-09 20:36:12 +02:00
marshmellow42 411105e036 added nexwatch demod & iceman lua 
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
 2015-04-08 14:19:03 -04:00
iceman1001 cff17e78f5 FIX: a wrong comment inside default_toys.lua 
FIX: a wrong linking to default_toys.lua in tnp3 scripts.
 2015-04-07 18:02:29 +02:00
iceman1001 c3fe354b19 CHG: fix the default_toys.lua file to handle more aspects of information for a given tag. 
CHG: corrected a bug in tnp3clone.lua that made the script fail to "wipe" a magic tag.
CHG: minor textual change in ndef_dump.lua
 2015-04-06 18:47:53 +02:00
marshmellow42 224ce36eb1 lf t5xx - icemans update 2015-04-05 16:37:41 -04:00
iceman1001 aa77d2b125 FIX: the test scripts hade a problem when sending the new configuration block. 2015-04-05 17:02:13 +02:00
iceman1001 6c81ae5574 CHG: the default_toys.lua has the index bytes in mix endiansness. I tried to clean it up and verify them. 
CHG: The tnp3clone.lua is now faster, and uses the "wipe" parameter to clean the tag before writing all data.
 2015-04-05 14:27:12 +02:00
iceman1001 7b47fa9b3d CHG: Script now also test to read block 0 via the chinese magic command if the normal read fails. 2015-04-02 12:07:51 +02:00
iceman1001 4076250660 CHG: minor fixes to some tnp luascripts 
ADD:  a script to make a barebone clone for tnp3 on a chinese magic s50 generation 1 tag.
 2015-03-30 16:15:53 +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