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

1306 commits

Author SHA1 Message Date
iceman1001 ca98f30c53 CHG: forgot one file for the RevEng update 2016-04-05 03:35:12 +02:00
iceman1001 0a25987730 Add; some keys 2016-04-05 03:34:46 +02:00
iceman1001 a78a3d9dc3 CHG: Updated RevEng1.31 to 1.40 
--snipped changelog

1.4.0	24 February 2016
	* Added 11 new algorithms, CRC-4/INTERLAKEN, CRC-7/UMTS,
	  CRC-8/LTE, CRC-8/SAE-J1850, CRC-11/UMTS, CRC-16/LJ1200,
	  CRC-24/BLE, CRC-24/INTERLAKEN, CRC-24/LTE-A, CRC-24/LTE-B,
	  CRC-30/CDMA, and 4 new aliases, CRC-12/UMTS, CRC-16/LTE,
	  CRC-16/UMTS, CRC-32/INTERLAKEN, from the CRC Catalogue.
	* Eliminated string comparison when testing if a model name is
	  an alias.
	* Split off presets into preset.c.
	* Eliminated bogus calls to bsearch() in preset.c.
 2016-04-05 03:34:03 +02:00
iceman1001 c3559d162a textual changes 2016-03-23 14:04:10 +01:00
iceman1001 b9e66427b7 Forgot some breaks, and a faulty comparision of a set bit. 2016-03-23 14:03:41 +01:00
iceman1001 186ad6037c ADD: added the ETU and Frame wait time based on the Frame wait integer value. 2016-03-23 14:02:50 +01:00
iceman1001 06eb3b1a8c coverity fixes for my latest changes. 
Forgot some breaks in 7816 annotation, and  presco used an uninitalized char array.
 2016-03-22 08:40:20 +01:00
iceman1001 774560e39e CHG: no parity tests for ISO_7816_4 annotation 2016-03-21 22:07:55 +01:00
iceman1001 5de71ee6bf CHG: enter a define for TIMEOUT 2016-03-21 22:07:23 +01:00
iceman1001 ab6d8a4c47 CHG: fixed the commands, its now valid calypso 7816 commands. 2016-03-21 22:06:51 +01:00
iceman1001 0fcfad0ee6 CHG: testing for windows clients to get a higher baudrate. Was 9600, testing 115200 as for non_win. 
CHG: testing to set USB 2.0 standard,  instead of USB1.1  ...
 2016-03-21 22:05:59 +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 7fa7e812fc ADD: added @marshmellow42 's changes to "lfdemod" 2016-03-20 19:39:06 +01:00
iceman1001 f400ff6519 CHG: not sure if this clearCommandBuffer helps when sending usbpackages from lua scripts. Having trouble with these usbpackages in 14B code. 2016-03-20 19:35:43 +01:00
iceman1001 a930542b0a FIX: the lua script hf_reader.lua now works with 14B tags. 2016-03-20 19:34:34 +01:00
iceman1001 eb7eab8570 code cleanup. 2016-03-20 19:33:59 +01:00
iceman1001 6fc68747f6 ADD: well, starting with a luascript for reading calypso tags, made me remake the 14b raw command on client and device side. Sorry @marshmellow42 , but this one broke your "hf 14b info" implementation. I fixed the "hf 14b read" and the hf search. So not to bad, but still a bit broken. The 14b raw device side is now very similar to 14a raw. Which is good. There is a Standard 14b 0x050008 detection and STmicroelectronic 0x0600 detection on deviceside. This removes a lot of code client side. 
I also made the SRi read functions better by combining them.   The demodulation / uart code should be the same as last summers changes.  The device side code can now be even smaller.
 2016-03-20 19:33:07 +01:00
iceman1001 790e8eae09 ADD: @icsom changes and additions to lua scripts for LEGIC 2016-03-20 19:25:48 +01:00
iceman1001 e3f9c50d81 ADD: changed the annotation for 14b, it now shows WUPB/REQB and number of slots we used. 2016-03-20 19:24:14 +01:00
iceman1001 77d1a423d5 CHG: minor changes to this lua script. One case it returns NIL, which makes it behave better. 2016-03-13 07:17:26 +01:00
iceman1001 aaa1a9a2dc CHG: Added calling clear bigbuff to zero out it also, instead of just "free" it. 
ADD:  downloading the EML part from BigBuffer specially.
 2016-03-12 09:03:28 +01:00
iceman1001 6c68b84a6e @Marshmellow42 additions: 
ADD: Q5 to 'LF PYRAMID'
ADD: ST sim addition to SIM ask.

REF: 29ada8fc08
 2016-03-07 18:53:02 +01:00
iceman1001 4e8fa8b448 ADD: get a updated script from @icsom 2016-03-06 13:26:13 +01:00
iceman1001 1f3d5401a6 FIX: adding a silent mode for Topaz detection. 
FIX: adding a silent mode for 14B detection.
 2016-03-06 13:21:42 +01:00
iceman1001 3607b5a96a ADD: Added the autodetection of Topaz to "HF SEARCH" 
FIX:  Fixed a minor bug in "HF SEARCH" where it always found a "14b" tag, making the command never test for other formats afterward the 14b test.
The 14b detection is not good still, conflicting return values is main reason for this bug
 2016-03-06 12:40:04 +01:00
iceman1001 38e4191705 CHG; a fix for "HF TUNE", I always were annoyed with the hf tune where it printed one value per row endlessly. So this fixes that, it uses "\r" to print on the same row. Works on MINGW/WINDOWS. Havn'nt tested it on Linux yet. But it looks good now. 2016-03-06 10:35:25 +01:00
iceman1001 eb891c385e ADD; added Marshmellow42 's fixes for indala and stuff. 
CHG: updated the CHANGELOG.md
 2016-03-06 07:56:44 +01:00
iceman1001 0db11b71ef ADD: Added the HitagS from @spenneb ref:https://events.ccc.de/congress/2015/Fahrplan/events/7166.html 
PM3 Master PR: https://github.com/Proxmark/proxmark3/pull/167

Adjusted the ENUM names to fit in my fork.  We need a better namestandard for it.
 2016-03-04 19:06:47 +01:00
iceman1001 7f0cb92e0d CHG: Added @icsom 's changes to his legic.lua script. 2016-03-01 07:07:56 +01:00
iceman1001 ff3e074478 CHG: some minor changes to the 14b, the read 14b lua, 2016-03-01 07:03:00 +01:00
iceman1001 c728b2b4cf FIX: Added @marshmellow42 's fix for ASK/Biphase simulation on deviceside. 
CHG: Added @marshmellow42 's refactoring of "gprox-II" demod.
 2016-03-01 06:57:02 +01:00
iceman1001 07291f87d8 ADD: finished of the "LF GUARD SIM" command. needs testing. 2016-02-28 23:28:38 +01: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 733eb42022 ADD: Added three legic luascript from @iscom (Mosic) Great work! 2016-02-28 14:50:49 +01:00
iceman1001 2453ca6529 CHG: better not to show the unfinished commands.. 2016-02-27 19:48:19 +01:00
iceman1001 50564be0f8 ADD: Started to add a "LF GUARD CLONE/SIM" functionality. *not working* all thats needed now is fixing the transformation from FacilityCode/CardNumber -> raw data for t55x7. 2016-02-27 19:47:10 +01:00
iceman1001 98c799ba49 BUG: smash stack in addParity call. Didn't take in consideration that it adds bits per parity to the array.. 2016-02-27 19:21:49 +01:00
iceman1001 90639dd1cc FIX: lets see if this fixes the pyramid clone crash on OSX 2016-02-27 18:57:49 +01:00
iceman1001 69c4516d32 chg: minor changes to text, explaining current implementation for "lf pyramid clone/sim" only works for 26bits. 2016-02-27 12:12:05 +01:00
iceman1001 220d638d92 ADD: started to add a lua script for reading 14b tags, will help when making scripts against iso 14443b tags. 2016-02-27 09:24:40 +01:00
iceman1001 4b3655e7f4 FIX: spelling misstakes. 
FIX: output of block number should be two digits for nicer layout
FIX: strange branching in the pyramid demod in cmddata.c,  it will now always print the unknown length message
FIX: another go at the coverity scan bug in proxmark3.c. (resource leak for cmd)
 2016-02-27 09:21:19 +01:00
iceman1001 ce9a7cbf33 ADD: "LF PYRAMID SIM" 2016-02-26 22:40:13 +01:00
iceman1001 581b31fb8a FIX: "LF PYRAMID CLONE" now works. 2016-02-26 22:10:27 +01:00
iceman1001 f087591d59 FIX: calcs wiegand correct, adds wiegand parity correct, adds checksum correct, add even parity to blocks correct. 
- when ran it clones nice,  the "lf search" finds a pyramid och checksom is ok.  However,  the wiegand decode is wrong.
Something about where in bitarray to put the startformat bit and wiegand bits...
 2016-02-26 21:11:56 +01:00
iceman1001 f6af1cf0ad FIX: the 14b crc was called wrong in LUA. You enter a hexstring already, and get a hexstring back. 2016-02-25 17:51:02 +01:00
iceman1001 71cb7328e3 ADD: added some pyramid commands. //not finished. 2016-02-25 17:49:48 +01:00
iceman1001 683180cb60 ADD: added a simple test of known pwd algos based on uid. 2016-02-24 08:31:46 +01:00
iceman1001 b9411ebac8 ADD: added a simple sleep function. Thanks to Mosci 2016-02-23 08:24:01 +01:00
iceman1001 a75d63f19b ADD: added the crc8legic to Lua. call it with core.crc8legic 
also a helper function to take a hexstring and calc the crc on it, was added inside utils.lua

   Call it inside a lua-script like this:

        local utils = require('utils')
        local data = '01020304'
	local crc = utils.Crc8Legic(data)
	print (uid,  ('%02x'):format(crc))
 2016-02-22 17:50:32 +01:00
iceman1001 c0f15a05b3 ADD: Marshmellows fixes for "lf t55xx" and "lf cmdread" ref: https://github.com/Proxmark/proxmark3/pull/166/files 2016-02-21 17:44:25 +01:00
iceman1001 b03006794f CHG: removing some time-debug statements. 
CHG:  increased the time-out message 2sec, in proxmark,  to make "hf mf chk" work better.
CHG:  still trying to solve the "hf mf mifare" WDT_HIT bug.

With these changes,  the "hf mf chk" / "Hf mf nested" looks similar and should be a bit faster.
 2016-02-19 22:34:39 +01:00
iceman1001 e66ff99cc9 CHG: revert old fiddeling, I should not touch the HIDflasher. 2016-02-19 22:32:38 +01:00
iceman1001 95215e873f FIX: this free call still annoys Coverity Scan. 2016-02-19 22:31:35 +01:00
iceman1001 0516439959 ADD: Added @marshmellow42 's new ST (sequence terminator detection) 2016-02-19 22:30:19 +01:00
iceman1001 25606bd724 FIX: For ld (linker) there is no "-=", so lets try re-assign ldlibs instead 2016-02-18 23:01:12 +01:00
iceman1001 28d47dc9b4 CHG: textual change in README.md 
FIX: Mac OSX ld (linker) warning for -L/usr/local/lib,  testing to remove it for mac builds.
 2016-02-18 21:08:47 +01:00
iceman1001 75cf8623d6 FIX: Undo one of my fixes.. *sigh* need to be more specific when / where to call free. 2016-02-18 20:48:24 +01:00
iceman1001 eb5206bd20 FIX: resource leak, forgot a free 2016-02-18 20:39:41 +01:00
iceman1001 1abd86f17a CHG: CHange the definition of MAX_GRAPH_TRACE_LEN to match eachother. 
REM:  removed a include header to graph.h in ui.h.
 2016-02-18 20:19:33 +01:00
iceman1001 dfc5ee8893 FIX: Removed a double const 2016-02-18 20:08:55 +01:00
iceman1001 45293f1096 FIX: the #define M_PI is now optional. Moved a bunch of header invocations into the ui.h 2016-02-18 20:08:34 +01:00
iceman1001 02ac2ed464 FIX: 256 is too big for uint8_t 2016-02-18 20:07:50 +01:00
iceman1001 805cd07e25 CHG: this makefile should compile on Ubuntu 1404 without problems. The QT4-5 detection is inside MINQW detection part. 2016-02-18 18:55:44 +01:00
iceman1001 fd9552568d CHG: First step to make my makefile better for other dev.env's These changes makes it look more like PM3 master version. The extra libs are added when MINGW is detected. 2016-02-18 18:43:20 +01:00
iceman1001 6cf8fcb002 FIX: corrected one of my own bugs which made the calccrc8 not accept the input hexstring. 2016-02-18 17:46:11 +01:00
iceman1001 838c15a643 ADD: added some time debug statements to be able to measure execution time. 
CHG: change the auth_ex method to send usb package faster,
REM: removed some bucketsort changes.
 2016-02-17 17:30:37 +01:00
iceman1001 aacb96d7ed FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and copying in C. 2016-02-17 10:46:08 +01:00
iceman1001 b882b54314 FIX: introduced a bug in a loop by uint8_t inside crapto1.c 
CHG: textual helptext change in "hf mf nested"
CHG: loop inside "nested". Still not fast enough. I wonder if qsort can be exchanged for radixsort or bucket sort?
 2016-02-16 23:46:34 +01:00
iceman1001 7504dc50d5 Merge branch 'master' of https://github.com/iceman1001/proxmark3 
Conflicts:
	armsrc/crypto1.c
 2016-02-16 21:43:45 +01:00
iceman1001 a1689f417f CHG: print_hex_break now prints rownumber instead of byte position 2016-02-16 21:39:25 +01:00
iceman1001 c2a714e3ce ADD: forgot to add the bruteforce command to the commandtable. *experimental, its a simple bruteforce* *not tested* 
CHG: some textual changes to helptext.
 2016-02-16 21:11:17 +01:00
iceman1001 1fe0992d06 FIX: marshmellow42 's fix using memcpy instead of re-assign pointer. 
Ref: 38b3509542
 2016-02-16 18:15:18 +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 98b2a3a1e9 FIX: the port error 10 on Mac, is fixed by @marshmellow42 , a wrong string format specifier was the root cause. 
ADD: some other adjustments from @marshmellow42 to the fsk demod identifier string.
 2016-02-16 09:24:45 +01:00
iceman1001 b0c2f708bc CHG: -O4 changed into -O3 to remove some compiler warnings clang, on mac .. 2016-02-15 22:06:17 +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 d7fd908447 FIX: change the "hf legid load", to use the WaitForResponseTimeout, instead of locking the client if device doesn't answer. 
CHG: starting to fix the "hf legic decode" and printing the user segements.  *WORK IN PROGRESS*
 2016-02-15 15:03:07 +01:00
iceman 5fdf867253 CHG: some timing 2016-02-15 02:49:04 +01:00
iceman e7902ca0a5 chg: removed testmessage 2016-02-15 02:45:43 +01:00
iceman1001 60bb5ef73b FIX: "hf legic decode" the stamp_len variable was int, but its used as a uint8_t. 
FIX: cmdlfem4x.c needed ref to cmdmain.h for clearCommandBuffer
 2016-02-14 15:30:26 +01:00
iceman1001 4c36581b96 CHG: clearCommandBuffer(); before calling cmdparser. 2016-02-14 15:24:11 +01:00
iceman1001 c6e0a2ebeb FIX: Faster data load. 2016-02-14 13:29:20 +01:00
iceman1001 e579e76873 FIX: The "hf legic load" had an bug where it send the read byte as uint32_t to the device. 2016-02-14 12:36:42 +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 3b920280db ADD: Calc legic Crc8 method on given input hexstring. 2016-02-14 11:56:54 +01:00
iceman1001 5a6e19e614 ADD: Started to add a Presco LF clone functionality. Can calc Wiegand from printed number. 2016-02-13 20:53:06 +01:00
iceman1001 6bb7609cad CHG: had to move the SwapBits method. 2016-02-12 16:19:18 +01:00
iceman1001 a11ca2f305 FIX: @wllm-rbnt 's typo fixes 2016-02-12 07:37:10 +01:00
iceman1001 fe144f121d CHG: Updated Reveng from 1.3.0 -> 1.3.1 
It now allows of values to be entered as hex i.e. 0x00
 2016-02-11 18:28:34 +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
iceman 6b10e3294e CHG: remade the mfchkkeys loop inside nested. This one send multiple keys at once, instead of one by one 2016-02-10 21:44:50 +01:00
iceman 480e2f2394 Merge branch 'master' of https://github.com/iceman1001/proxmark3 
Conflicts:
	client/cmdhfmf.c
	client/cmdmain.c
 2016-02-10 13:29:23 +01:00
iceman 719b2377be chg: what? 2016-02-10 13:22:48 +01:00
iceman 847f7404ff CHG: added some timing messages, 2016-02-10 13:20:23 +01:00
iceman1001 a9e4e78f83 CHG: syntax suger 2016-02-10 13:12:01 +01:00
iceman1001 6f79363dba Syntax suger 2016-02-10 13:10:27 +01:00
iceman1001 089d061f2d CHG: Extracted @piwi's bucketsort into separate files under /common 2016-02-10 13:09:33 +01:00
iceman1001 e0b30228e9 FIX: clearing a char array. 2016-02-10 13:07:44 +01:00