Commit Graph
100 Commits
Author SHA1 Message Date
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 7c8b5e6811 comment fudan check possibilities 2015-06-20 21:33:42 -04:00
marshmellow42 f4217d58b6 add ultralight compatible test 2015-06-18 17:19:43 -04:00
marshmellow42 6ac4cb270a minor fixes
see @icemant1001 -
https://github.com/iceman1001/proxmark3/commit/0ad1a1d492ab62eb42c1eb7b4ce6fff05d90e0a3
for more details
2015-06-15 00:44:57 -04:00
marshmellow42 ddcb2bb5ca Merge pull request #6 from marshmellow42/master
fix biphase
2015-06-14 18:12:16 -04: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
marshmellow42 4a3f1a3793 revert t55xx start gap and write timing changes
also noted specs in comments
2015-06-11 23:52:40 -04: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
marshmellow42 cf4d3e21b0 add fdx-b to cmddata.h 2015-06-04 00:05:37 -04:00
marshmellow42 ecfcb34cc5 add fdx-b to lf search 2015-06-04 00:04:49 -04: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
marshmellow42 4a74e2be72 add my_d move lean identification. 2015-06-01 00:18:03 -04:00
marshmellow42 be290d68bd new lua script from @iceman1001 + bug fix in hf mfu 2015-05-31 16:08:58 -04:00
marshmellow42 1c4c0b0681 add @Iceman1001 s sha1 scripting changes. 2015-05-30 21:51:15 -04: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 5b37e87a24 fix help typo 2015-05-28 22:52:41 -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 e35031d2b7 MFU code cleanup - final ?
fixed bug in debug print in MF 1k sim.
2015-05-27 17:21:42 -04:00
marshmellow42 4973f23d3c clean up mfu device side code
+ add xor calc to util (prep for desfire)
commented out MifareUWriteBlockCompat as it isn't used in client
currently (it is a command we could support..  but why?)
relabeled a few device side mfu functions to be clearer.
2015-05-27 12:24:13 -04:00
marshmellow42 be10fe2f11 update changelog 2015-05-27 00:32:01 -04:00
marshmellow42 dcbaa2b582 @iceman1001 s lua script fix 2015-05-26 20:31:07 -04:00
marshmellow42 22342f6dfe Add clearCommandBuffer before SendCommand
adjust output of mfu rdbl to be consistent
fix output of mfu dump in case startPage was specified. (also was
missing "i" in second print...)
2015-05-26 10:40:23 -04:00
marshmellow42 e406dd5cc9 Merge remote-tracking branch 'upstream/master' 2015-05-24 22:31:13 -04:00
marshmellow42 79d7bcbb51 updated mfu rdbl and wrbl commands
@iceman1001 s rdbl and wrbl cmd updates.
dump screen output adjusted
2015-05-24 22:28:21 -04:00
marshmellow42 0ce03d9ab0 fix mfu dump getbigbuffer bug
Thanks @iceman1001 for catching my oops, and fixing it :)
2015-05-23 22:35:50 -04:00
marshmellow42 012c0761bd hf mfu minor output adjustments
dump key placed properly for EV1 and NTAGs

config pages for ntags corrected in printout

note on config that PWD and PACK cannot
actually be read from memory  (probably could just delete them (other
than it shows what memory block they are stored in for changing...)
2015-05-22 13:17:51 -04:00
marshmellow42 8f2e50b4c5 mfu info authkeyptr fix
didn't follow @iceman1001 s l parameter changes fully...  fixed now..
:)
2015-05-22 07:29:18 -04:00
marshmellow42 06561c34ef fix to dump cmd print keys.
add l option to info cmd.
add ascii print to dump (screen only)
other minor clean up
2015-05-22 00:15:57 -04:00
marshmellow42 efd193519c hf mfu bug fixes, and help text fixes 2015-05-21 11:17:01 -04:00
marshmellow42 1c429594a1 further mfu info updates
needed to auth select when a command failed for locked tags.
some output cleanups from @iceman1001
2015-05-20 16:47:40 -04:00
marshmellow42 cd87ee9133 finish NTAG i2c +...
thanks iceman
2015-05-20 15:42:58 -04:00
marshmellow42 46fcd738e0 finish NTAG i2c +...
thanks @iceman1001
2015-05-20 15:41:48 -04:00
marshmellow42 8241872c47 ULEV1_48 had the wrong max block 2015-05-20 14:22:26 -04:00
marshmellow42 ea11861793 minor adjustments to hf mfu 2015-05-20 14:17:43 -04:00
marshmellow42 c7442b7673 Add NTAG i2c and bug fix
also streamlined select tag code
2015-05-20 14:06:46 -04:00
marshmellow42 a383f4b708 Add ntag 210, 212, 203 and bug fix 2015-05-20 11:27:44 -04:00
marshmellow42 a98b05b71d missed file in previous commit...
duh...
2015-05-19 15:03:35 -04:00
marshmellow42 d7acc6403e hf mfu dump - bigbuf allocation fix
some larger nfc tags can get large so set the allocation to the 4k
CARD_MEMORY_SIZE buffersize.
2015-05-19 11:30:50 -04:00
marshmellow42 29250969b0 @iceman1001 s comments/updates mfu cmds 2015-05-18 22:07:11 -04:00
marshmellow42 9d87eb6650 MF ultralight code cleanup 2015-05-18 13:11:00 -04:00
marshmellow42 8258f40969 Iceman1001 s MFU clean up
cleaned up MF UL_C auth code device side.
2015-05-17 20:49:25 -04:00
marshmellow42 cceabb79e6 mfu info / dump attempt at missing auths
NOT TESTED.  will test soon.  probably has bugs!
2015-05-16 01:00:31 -04:00
marshmellow42 ae8303c13c mfu dump - beginning of additions 2015-05-15 01:19:58 -04:00
marshmellow42 5b99376a8f hf mfu dump testing 2015-05-15 00:57:51 -04:00
marshmellow42 93737008ee @iceman1001 s default keys 2015-05-14 22:55:18 -04:00
marshmellow42 9ccfb3a8bc @iceman1001 's updated lualibs 2015-05-13 21:36:20 -04:00
marshmellow42 ab7fdfcbed @iceman1001 updated scripts 2015-05-13 21:20:23 -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
marshmellow42 6fdf42c61c minor hf mfu info adjustment from @iceman1001 2015-05-13 11:22:27 -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 a2e2bb8a15 hf mfu info - ICEMANS updates
plus slight change to UL_EV1 auth annotation.
2015-05-12 18:16:55 -04:00
marshmellow42 6ce0e5386a HF Search - refactoring cmds to work with it 2015-05-12 16:45:48 -04:00
marshmellow42 8ceb6b03e5 hf search - prelim - re-use hf mfu GetTagType...
in hf 14a reader to identify UL(+)

still a work in progress.
2015-05-12 00:19:44 -04:00
marshmellow42 2be768af57 hf mfu info bugs 2015-05-11 18:22:50 -04:00
marshmellow42 4693c188ab minor hf mfu output consistancies 2015-05-11 16:25:11 -04:00
marshmellow42 345fb24aaa hf mfu info - ICEMANS bug fixes. 2015-05-11 15:56:12 -04:00
marshmellow42 f04ef47311 hf mfu info bug fixes 2015-05-11 14:49:37 -04:00
marshmellow42 f805ac7a2b minor adjustments to mfu info 2015-05-08 13:01:27 -04:00
marshmellow42 c585a5cf0b further MFU info updates (mainly icemans) 2015-05-06 22:15:41 -04:00
marshmellow42 372a82570b MFU adj to allow 0 len returns on raw cmds 2015-05-06 10:17:39 -04:00
marshmellow42 45673b9457 MFU adjustment to allow 0 len returns from raw cmds 2015-05-06 10:16:31 -04:00
marshmellow42 abab60ae21 MFU info adjustments 2015-05-06 09:27:03 -04:00
marshmellow42 75377d29d6 MFU - Icemans further improvements
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
2015-05-06 00:55:29 -04:00
marshmellow42 63e1d35a07 Merge remote-tracking branch 'upstream/master' 2015-05-03 23:31:58 -04: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 b3125340f3 Icemans UL-C Auth dev side fix plus a few other ...
... small UL fixes
2015-05-03 15:41:11 -04:00
marshmellow42 7eec1204e7 fix bug in mfu cauth 2015-04-30 10:34:20 -04:00
marshmellow42 92690507ab Iceman's updates to MFU info and dump 2015-04-30 09:28:43 -04:00
marshmellow42 f168b2633b MF Ultralight - Iceman's updates + mine
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
2015-04-29 18:27:31 -04:00
marshmellow42 bdfb62b405 Iceman's script aes fix #93
Thanks Iceman (note I did not have a tag to double test this one. :)
2015-04-28 15:53:07 -04:00
marshmellow42 e9b8d0dd6e Iceman's mf sim 7bt UID fix from #97 2015-04-28 15:43:58 -04:00
marshmellow42 4745afb647 Iceman's Issue #96 fix 2015-04-28 15:35:23 -04:00
marshmellow42 8e0cf02308 minor change to lf em4x menu & iceman script...
...updates
2015-04-10 00:06:59 -04:00
marshmellow42 664f658650 nexwatch fix .h file + icemans mf csetblk w arg
forgot to include the new nexwatch command in the header...
added icemans hf mf csetblk w parameter fix
2015-04-08 15:08:05 -04:00
marshmellow42 25d3e5cc83 Merge remote-tracking branch 'upstream/master' 2015-04-08 14:19:19 -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 322f7eb111 fix to lf t5 detect/read cmds
i think this functions fairly well...
still some issues with demod positioning for various reasons.
ASK/Biph/FSK work pretty well
the PSK Demod still needs a little attention to help it better demod
various carriers...
2015-04-08 11:18:29 -04:00
marshmellow42 9632ecbe3d update t5 detection test()
missed this file in last commit... sorry.
2015-04-08 10:12:24 -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 224ce36eb1 lf t5xx - icemans update 2015-04-05 16:37:41 -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 643fb10b2d Merge remote-tracking branch 'upstream/master' 2015-04-04 21:29:16 -04:00
marshmellow42 acaeccf841 update changelog 2015-04-03 00:40:38 -04:00
marshmellow42 6e98444637 lfdemod reduce duplicate code
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
2015-04-02 23:55:12 -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
marshmellow42 a4669d6ef3 small fix in t5 trace data 2015-03-31 11:30:16 -04:00
marshmellow42 75cbbe9a69 remove floats per piwi 2015-03-31 10:49:06 -04:00
marshmellow42 070e3c4305 Merge remote-tracking branch 'upstream/master' 2015-03-27 23:49:14 -04:00
marshmellow42 f8f894a50f rawdemod param cleanup
plus lfdemod.h cleanup
2015-03-27 23:47:31 -04:00
marshmellow42 2eec55c8a4 lfdemods streamline & bug fixes
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod

cleaned up lfdemod.c some
2015-03-27 00:02:30 -04:00