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
4175 commits 3 branches 14 tags 86 MiB
Commit graph

255 commits

Author SHA1 Message Date
iceman1001 d2f79fa83f ADD 'lf nexawatch' by marshmellow42 
ADD 'lf securakey'  by marshmellow42
ADD 'lf pac'  by marshmellow42
chg: parity.h got some love from pm3 master.
 2017-07-14 15:51:12 +02:00
iceman1001 a47ded5b54 ADD: data detectclock - added clock blocks in plot window. Its a draft. Not working for all clocks. 
ADD: STT is now marked as a block in plot window,  instead of Marshmellow42 's two lines.
 2017-03-02 14:53:50 +01:00
iceman1001 a9eeb57698 CHG: Added PR #220 from PM3 Master. ref: https://github.com/Proxmark/proxmark3/pull/220 2017-03-01 20:14:46 +01:00
iceman1001 4eabb8ad38 CHG: minor LF adjustments. 
CHG: `lf visa2000` - removed askedgedetect, it seemed it destroyed more than enhanced.
 2017-02-28 16:55:16 +01:00
iceman1001 a8fd088d8b FIX: lf search - em410x demod was a bit greedy. 2017-02-28 14:47:25 +01:00
iceman1001 41611deef9 CHG: some of @marshmellow42 's ref: 2b11c7c750 
CHG: `lf em 410x` - when demoded to all zeros, it wasn't printed so some noninitalized tags just gets a empty "found em410x tag" message. Hav'nt decided on how to go further with it.
 2017-02-27 14:04:50 +01:00
iceman1001 5215a87442 CHG: @Marshmellow42 's fixes. ref: e88096ba25 2017-02-24 01:14:47 +01:00
iceman1001 9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001 5e9d59fe2a syntax sugar 2017-02-19 01:34:45 +01:00
iceman1001 bd09006a8c CHG: 'lf em4x' - the em4x50 demod didn't calc ASKDemod_ext with a refenence bool. 
CHG:  'lf em4x' - refactored the code for emd4x50 demod
 2017-02-16 16:38:09 +01:00
iceman1001 a38f5a0704 FIX: @marshmellow42 's fixes for enhanced STT and AskDemod. Now the "lf presco read" works on cargs with strong/clean/clipped waves 2017-01-20 10:03:53 +01:00
iceman1001 316493876a FIX: 'data print' - now don't crash the client when demodbuffer is empty 
CHG:  'guard' - the Guard output more unified.
 2017-01-18 22:55:37 +01:00
iceman1001 efbf81da52 FIX: 'hw tune' - peakf shouldn't be compare with voltages limits :) 2017-01-18 13:35:00 +01:00
iceman1001 bb52291837 CHG: 'hw tune' adhjusted the NON_VOLTAGE limit to 0.999v, below this value the antenna is considered not connected. 2017-01-18 13:18:03 +01:00
iceman1001 81b7e89434 CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679 
CHG: added some documentation about what arguments does.
CHG: 'data tune' - added flush after printf.
 2017-01-16 21:06:51 +01:00
iceman1001 c621ae0614 CHG: 'data zerograph' - array out-of-bounds fixed. 
CHG: syntax sugar
 2017-01-16 14:44:37 +01:00
iceman1001 3acac886bc ADD: 'lf search' - added a rudimentary identification of IDTECK tags, will demod to PSK1, if fails it tries to PSK1 inverted demod. 2017-01-12 00:04:36 +01:00
iceman1001 87c10b2a0f CHG: some indala output is now only in debug mode 
CHG: added 34|37 bits AWID format.  I'm guessing 37bit is wrong since the parity is still there. Which it shouldn't
 2017-01-05 15:55:19 +01:00
iceman1001 c48211f7ed ADD: 'lf animal' commands. CLONE/SIM/READ/DEMOD of FXD-B animal tags. Still some work left. 2017-01-05 01:51:47 +01:00
iceman1001 bb73c58d9a CHG: made some debugs statements more clear, when "LF SEARCH" is used with "DATA SETDEBUG 1" 2016-12-19 15:32:18 +01:00
iceman1001 92014925d6 CHG: 'LF VISA2000' adding askedgedetection when decoding allows for some traces to be correct demodulated. 2016-12-16 19:06:19 +01:00
iceman1001 c08c796e8d CHG: enhanced the debug output for some LF demod/decode 2016-12-16 12:04:37 +01:00
iceman1001 eb911aa8d6 ADD: 'lf visa2000' commands. (SIM/CLONE/READ) almost finished. 
CHG: 'lf xxxxx'  reduced number of samples from 30000 -> 20000 in "lf xxxxxx read" commands.
CHG: 'data samples'  - didn't honor the silent parameter. It now output less for the 'lf xxxxxx read' commands.
 2016-12-14 23:23:16 +01:00
iceman1001 dc3a58466d CHG: 'lf search' changed output to be visible when debugging for IO prox 2016-12-13 12:27:40 +01:00
iceman1001 2dcf60f3df CHG: "hf mf hardnested" - less printing 
CHG: some filehandles = NULL.
 2016-10-21 16:06:53 +02:00
iceman1001 da1f16d6ef CHG: increased debug output for Em410x 2016-10-16 21:50:41 +02:00
iceman1001 7d0efb37d8 CHG: the "indent" software warns about some assingments. I've tried to fix them. 2016-09-26 10:37:00 +02:00
iceman1001 d801514d88 CHG: Supressing output for LF or HF antenna values if zero, in 'hw tune' command 2016-09-01 20:36:10 +02:00
iceman1001 56d0fb8e4d FIX: bug in nextwatch demod, which if the found psk bits was smaller than the preamble the client crashed. 
REM: removed some debugstatements
 2016-09-01 16:09:31 +02:00
iceman1001 4c543dbd3f ADD: added a simple averging filter function. input parameter K, can be 1 to 8 
ref: http://www.edn.com/design/systems-design/4320010/A-simple-software-lowpass-filter-suits-embedded-system-applications
 2016-08-29 20:29:31 +02:00
iceman1001 a152dea7b4 textual changes. 2016-08-07 18:50:25 +02:00
iceman1001 a0c7eea77a CHG: moved out some help-texts into its own usage-functions. 2016-07-31 11:37:19 +02:00
iceman1001 6c28395106 ADD: LF JABLOTRON functionality. with clone/sim and detection in LF SEARCH. 
CHG: removed no-existing crc8ja code
FIX: a check in ASKbiphaseDemod to make sure graphbuff is not empty.
 2016-07-29 11:04:12 +02:00
iceman1001 9d7e9935af syntax suger 2016-07-07 02:10:09 +02:00
iceman1001 180ec86ef0 @marshmellow42 's fix the AskEdgeDetect cleaning tool. de53156e1e 2016-06-20 13:26:45 +02:00
iceman1001 6a4271d186 CHG: Changed cardnumber printing from %d (signed) to %u (unsigned) for AWID50, it now prints correct in all cases. Thanks to @ntk for reminding me about it. 2016-05-14 14:34:35 +02:00
iceman1001 204b708424 ADD: AWID 50bit demod, thanks to @FrancoisM and @ntk 2016-05-13 22:34:49 +02:00
iceman1001 c0afa86f75 FIX: this commit solves a sneaky bug in 'LF VIKING' commands. The getVikingBits dropped the highest byte in the uid while creating the datablocks for the clone. 
ADD:  added some extra message in debugmode when looking at viking tags.
 2016-04-24 21:41:45 +02:00
iceman1001 40f6f2ff50 ADD: started to add a BUTTERWORTH filter, not working yet. 2016-04-14 11:37:17 +02: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 eb891c385e ADD; added Marshmellow42 's fixes for indala and stuff. 
CHG: updated the CHANGELOG.md
 2016-03-06 07:56:44 +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 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 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 71cb7328e3 ADD: added some pyramid commands. //not finished. 2016-02-25 17:49:48 +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 0516439959 ADD: Added @marshmellow42 's new ST (sequence terminator detection) 2016-02-19 22:30:19 +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 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 4c36581b96 CHG: clearCommandBuffer(); before calling cmdparser. 2016-02-14 15:24:11 +01:00
iceman1001 a0048c6967 CHG: increased timeout when calling "hw tune". 2016-02-09 14:46:46 +01:00
iceman1001 1d42f25fcd FIX: Coverity, out-of-bounds write, CID# 121336, s_index should take factor in consideration when looping. Not sure about this one. 
FIX: another thing struck me, the g_index wasn't increased, meaning the "un-decimation" always worked on the same first byte of GraphBuffer.
 2016-01-12 22:15:49 +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 bf32dd923f ADD: @marshmello42 's fixes for low frequency demodulation lengths greater the 512bits. 2015-12-09 14:58:16 +01:00
iceman1001 3f26796673 FIX: the lfsampling.c for t55xx had a tendecy to enter a neverending loop. Moved exit branch into the while statement, which seems to solve it. 
FIX: Strange int -> uint8_t casting behavior  (0x05 gets the 25bit set and becomes 0x10005 instead) in fskdemod,  removed int and sscanf.
 2015-12-01 22:38:37 +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 52f2df615b ADD: lf indalademod output, The binary string is now printed with linebreaks every 16bits 
ADD: lf awid code is modified,  some minor changes in outputs
ADD: lf t55xx write now prints the password on the same row,  looks better when using the new "lf t55xx wipe" command.
ADD: the ioprox T55X7_IOPROX_CONFIG_BLOCK block.
 2015-11-21 18:48:58 +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 edaf10af99 CHG: minor code clean up, removed commented old code. 
ADD: usb_poll_validate_length  to some deviceside loops.
ADD: @marshmellow42 's fixes to LF
 2015-11-09 21:51:34 +01:00
iceman1001 afa86e5c03 ADD: help text for 'hf snoop' / 'hf search' / 'hf list' 
CHG: minor code changes.
CHG: makefile ,  moved hi_sniffer.v from LF into HF row.  @piwi suggestion for PR https://github.com/Proxmark/proxmark3/pull/141
 2015-11-01 19:49:08 +01: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 b10a759fef @PM3 master merges, Piwi fix for mfnested 
@Marshmellow42 's fix for FDB
 2015-07-12 22:58:16 +02:00
iceman1001 f53020e729 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/iso14443b.c
	armsrc/lfops.c
	client/cmdhf14b.c
	client/cmdhfmfu.c
	fpga/fpga_hf.bit
	fpga/hi_read_rx_xcorr.v
 2015-06-23 23:02:29 +02:00
iceman1001 24344f28ad FIX: ref 2ec8773314 
@marshmellow42 's fixes for pskdemod and mfu.
 2015-06-23 19:22:40 +02:00
marshmellow42 2ec8773314 fix bug in pskdemod return value if no samples... 
... caused crash in data psknexwatchdemod if no samples were in the
graphbuffer.
also fixed hf mfu wrbl and rdbl to allow printing of help without a tag
being present.
 2015-06-23 12:16:23 -04:00
marshmellow42 6ac4cb270a minor fixes 
see @icemant1001 -
0ad1a1d492
for more details
 2015-06-15 00:44:57 -04:00
iceman1001 0ad1a1d492 FIX: minor variable fixes when compiling on linux. 
cmddata.c: In function ‘Cmdmandecoderaw’:
cmddata.c:420:2: warning: format ‘%i’ expects argument of type ‘int *’, but argument 4 has type ‘size_t *’ [-Wformat=]
  sscanf(Cmd, "%i %i", &invert, &maxErr);
  ^

cmdlfem4x.c: In function ‘CmdEM410xRead’:
cmdlfem4x.c:58:2: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’ [-Wformat=]
  sprintf(id, "%010llx",lo);
  ^
 2015-06-14 23:02:52 +02:00
iceman1001 b4c1f167da FIX: old bug back, and now fixed again. @marshmellow42 2015-06-14 17:18:22 +02:00
marshmellow42 fd227f4e7d add comment 2015-06-14 11:11:00 -04:00
marshmellow42 c7d6721290 bug fix. askdemod edits invert pointer, cannot be 0 2015-06-14 10:54:55 -04:00
iceman1001 1299c798fc ADD: @marshmellow42 's 14b reader changes. 
FIX: @marshmellow42 's ASKbiphaseDemod fixes.
CHG: added a check in ASKbiphaseDemod to make a compiler warning message go away.
 2015-06-14 14:39:50 +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
marshmellow42 8e2e6c8eb0 add clock to ask rawdemod outputs 
fix biphase invert bug (correctly)
 2015-06-07 00:42:57 -04:00
marshmellow42 07b5a3c3ba Modified kermit crc to use existing crc calc code 2015-06-05 22:39:56 -04:00
marshmellow42 c2c7f6c271 fdx-b clean up 2015-06-04 13:10:33 -04:00
marshmellow42 6eaa8da9dc Add CCITT Kermit CRC check for FDX-B demod 2015-06-04 12:53:19 -04: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
marshmellow42 b2c330b367 bug fix - biphase invert + fdx-b adjustments 2015-06-03 23:59:22 -04:00
marshmellow42 fd1d30cb76 addition animal tags demod info 2015-06-03 18:28:56 -04:00
marshmellow42 04bb05670d Testing animal tags 2015-06-03 16:52:20 -04:00
iceman1001 22a6a62fbb ADD: removed the paritythingy, I missunderstood its purpose. 2015-06-03 22:38:59 +02:00
iceman1001 7f96433c8a CHG: trying to get the askdemod / biphasedeocde / finding startmarker / removeparity to work in ISO11784demod 2015-06-03 22:19:32 +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 2d2f7d1948 ADD: @marshmellow42 's changes / fixes. 2015-05-31 21:47:33 +02:00
marshmellow42 185e038c7d fixed further typo in lf t5 wr help 
also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer
 2015-05-28 23:14:06 -04:00
marshmellow42 979bba376d add offset option to data printdemodbuffer 
easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>
 2015-05-28 13:23:31 -04: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
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
marshmellow42 fef74fdce4 lf ask consolidation 
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category

front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
 2015-04-08 01:07:39 -04:00
marshmellow42 49bbc60af3 lf cleaning++ 
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
 2015-04-07 00:53:06 -04:00
marshmellow42 cc15a1187b lf cleanup - fixes 
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
 2015-04-06 23:17:30 -04:00
marshmellow42 1f918317e2 add maxErr to data manrawdecode 2015-04-05 21:59:36 -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
marshmellow42 23f0a7d862 lfem4x cleanup/add/fix 
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
 2015-04-02 12:48:52 -04:00