Commit graph

1014 commits

Author SHA1 Message Date
iceman1001
5636ee8ce6 ADD: 'hf mfu info' now prints following settings:
NFC_COUNTER_EN       - If set, every read,fast_read increases a counter.
      NFC_COUNTER_PROT_PWD - If set, reading nfc_counter needs a successfull pwd authentication before
These new settings is only valid for NTAG213/215/216,
2015-11-22 18:13:26 +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
0956e0dba5 FIX: an error that I introduced to the csetblock command with wrong length of crc calcs.
CHG:  variable name in csetblock change.  just trying to be consistant.
ADD:  code clean up in hf 14a,  added some help text methods.
2015-11-10 11:45:45 +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
4db2af08cd fix: forgot to remove this when merging piwi's fixes. 2015-11-09 22:06:48 +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
bca7107931 ADD: @marshmellow fix for em41x clock.
CHG: swap the int to a uint8_t to skip a compiler error
2015-11-09 21:49:02 +01:00
iceman1001
cc3c0a5148 ADD: @piwi's fixes to .history 2015-11-09 21:46:57 +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
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
84f9cf0626 ADD: a minor xor script 2015-10-30 09:07:04 +01:00
iceman1001
f218d50efb ADD: @gm4tr1x found some new known mifare keys. 2015-10-30 09:05:22 +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
1c8fbeb93e ADD: 'LF T55X7 WAKEUP' command. For tags with AOR bit set, send this command with password to wake tag up and be able to do a "LF SEARCH" etc on it.
CHG:  Minor code changes on T55X7 code.   Default password is back to 'FF FF FF FF',
REM:  removed @marshmellow42 's wakeup option in "lf t55x7 read",

---  BASICALLY:
if a  T55X7 tag has following bits set:
AOR -  send wakeup command with pwd, to enable LF interacting with it.
PWD -  send read/write/trace/info command with pwd.  No need to send wakeup.
2015-10-21 09:12:33 +02:00
iceman1001
f82894ba69 CHG: move some methods, its easier to read now. Cosmetic change. 2015-10-21 09:07:36 +02:00
iceman1001
9276e859a6 ADD: @marshmellows42 's fixes for "lf cmdread" and CHANGELOG.md
ADD:  Added the "lf t55x7 wakeup" command. It will send a pwd,  and leave the antenna on.
Process like:
1. lf t55x7 wakeup p 11223344
2. lf search

---
It is still not finished,  will work together with the "lf t55x7 commands" in next step when I figure out the process from the datasheets.
2015-10-20 19:00:02 +02:00
iceman1001
b87f99f4bb ADD: some more keys found on a pastebin 2015-10-19 22:41:53 +02: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
952a812c00 FIX: a suggested fix for #136 where the "lf t55x7 read" command when called with a password. The call will now try loading the config block, decode it and see if PWD is set.
If PWD Bit is set,  the call will be allowed to execute.
If PWD Bit is NOT set,  the call will print a message and excute the call but without sending the password.
If config block is not being able to read or decode,   the call with print a warning message and exit the call.
2015-10-15 19:17:20 +02:00
iceman1001
6a09bea427 CHG: code clean up. Have some questions regarding the CopyVikingTo method. The configblock looks wrong.. 2015-10-15 11:30:37 +02: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
274e7dd110 FIX: fixed the "lf pcf7931 write" input validation. *untested* 2015-10-14 11:16:43 +02:00
iceman1001
ba52aac40e FIX: Removed a arrat from the struct configPcf in "LF PCF7931" 2015-10-12 21:49:11 +02:00
iceman1001
2285d9dd94 FIX: I did a clean up of the "LF PCF7931" code. The write command is not quite done.
FIX: Added some more "clearCommandBuffer" calls before sending..
2015-10-12 21:30:54 +02:00
iceman1001
5ee53a0e75 ADD: There were lot of calls to enable tracing, but very few to turn it of afterwards in the methods.
Don't know if it has some influence but can't hurt calling  "set_tracing(FALSE);"  when method returns.
2015-10-11 19:14:17 +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
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
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
05beaa8dd8 MINOR CHG: help text change for the "lf t55xx config" command. change NZ into NRZ 2015-08-12 21:39:29 +02:00
Iceman
a71c68bdf0 Merge pull request #4 from gcohen55/ubuntu_makefile
updated makefile, readme
2015-08-04 09:34:24 +02:00
Gil Cohen
8fac5452b8 updated makefile, readme 2015-08-03 23:07:57 -05: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
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
14e1862537 REM: removed a comment
ADD: added the ISO14443b command to commands.lua
2015-07-24 16:45:52 +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
f445df401e ADD: started with adding a "LS" command that lists the commands without the help text printed. To give easy clean list. 2015-07-22 11:19:15 +02:00
iceman1001
5b59bf20c7 FIX: "hf list 7816", the s-blocks is now also printed.
FIX: iso14443b.c got some minor adjustments in the demod and codeas14443btag. Seems it works better for me.
I still have the problem with powerup of a 14b tag.  I need to run the "14b raw -c -p 05 00 08" a couple of times before I get an answer.
2015-07-19 23:24:19 +02:00
iceman1001
db25599d7f ADD: @holiman's clearCommandBuffer in cmdlft55xx.c
ADD: @VERTCraig's AVID commands.

TEST: testing some changes to iso14443 demod.
2015-07-18 20:43:14 +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
d8af608f8e TEST: Moebius two noce mfkey32... 2015-07-13 23:06:49 +02:00