]>
cvs.zerfleddert.de Git - proxmark3-svn/log
iceman1001 [Sun, 14 Jun 2015 15:19:41 +0000 (17:19 +0200)]
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.
iceman1001 [Sun, 14 Jun 2015 15:18:22 +0000 (17:18 +0200)]
FIX: old bug back, and now fixed again. @marshmellow42
iceman1001 [Sun, 14 Jun 2015 12:39:50 +0000 (14:39 +0200)]
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.
iceman1001 [Sat, 13 Jun 2015 10:14:38 +0000 (12:14 +0200)]
minor textual changes from @marshmellow42
iceman1001 [Sat, 13 Jun 2015 10:13:21 +0000 (12:13 +0200)]
FIX: Reverting the t55x7 timings. (@marshmellow42 's fix)
iceman1001 [Wed, 10 Jun 2015 06:46:16 +0000 (08:46 +0200)]
ADD: @marshmellow42 's new "-g" search for crc in a hexstring *great*
ADD: fixes in the reveng calling methods
iceman1001 [Tue, 9 Jun 2015 19:46:22 +0000 (21:46 +0200)]
fix: nice output..
iceman1001 [Tue, 9 Jun 2015 19:32:22 +0000 (21:32 +0200)]
@marshmellows memory fixes for reveng1.30 in client..
iceman1001 [Tue, 9 Jun 2015 19:29:24 +0000 (21:29 +0200)]
@marshmellows memory fix
iceman1001 [Tue, 9 Jun 2015 19:28:06 +0000 (21:28 +0200)]
CHG: minor layout and call fixes to e.lua (the test script for hooking up reveng1.30)
iceman1001 [Tue, 9 Jun 2015 11:31:53 +0000 (13:31 +0200)]
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.
iceman1001 [Sun, 7 Jun 2015 09:35:49 +0000 (11:35 +0200)]
ADD: iso11784/85 FDX-B
ADD: the source from RevEng 1.30, got into the PM3 client.
iceman1001 [Thu, 4 Jun 2015 08:33:55 +0000 (10:33 +0200)]
ADD: @marshmellow42 's fixed version of the ISO11784 FDX-B
ADD: crc16_ccitt_rev (reverse version of crc16_ccitt 0x0000)
iceman1001 [Wed, 3 Jun 2015 20:38:59 +0000 (22:38 +0200)]
ADD: removed the paritythingy, I missunderstood its purpose.
iceman1001 [Wed, 3 Jun 2015 20:19:32 +0000 (22:19 +0200)]
CHG: trying to get the askdemod / biphasedeocde / finding startmarker / removeparity to work in ISO11784demod
iceman1001 [Wed, 3 Jun 2015 19:35:03 +0000 (21:35 +0200)]
ADD: next step ISO11784/85
iceman1001 [Wed, 3 Jun 2015 19:12:55 +0000 (21:12 +0200)]
ADD @pwpiwi 's fixes for "HF 14B" commands.
iceman1001 [Wed, 3 Jun 2015 19:12:24 +0000 (21:12 +0200)]
FIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase.
ADD: started witha ISO11784/85 demod function.
iceman1001 [Tue, 2 Jun 2015 10:23:06 +0000 (12:23 +0200)]
DEL: removed old iso14443.c since @pwpiwi renamed it..
iceman1001 [Tue, 2 Jun 2015 10:20:48 +0000 (12:20 +0200)]
CHG: removed an extra fclose call
iceman1001 [Tue, 2 Jun 2015 10:20:16 +0000 (12:20 +0200)]
ADD: @marshmellow42 's infineon MY D(tm) MOVE LEAN tag identification
iceman1001 [Tue, 2 Jun 2015 10:18:54 +0000 (12:18 +0200)]
CHG: help text output was not aligned because of tabs/spaces
iceman1001 [Tue, 2 Jun 2015 10:17:34 +0000 (12:17 +0200)]
ADD: @pwpiwi 's fixes for 14b. Including a rename from iso14443.c -> iso14443b.c
iceman1001 [Sun, 31 May 2015 20:33:12 +0000 (22:33 +0200)]
CHG: remade selftest structure
CHG: removed debugstatements
iceman1001 [Sun, 31 May 2015 19:49:00 +0000 (21:49 +0200)]
FIX: minor fix to the magictest function. It always makes a select tag first, but never took in consideration that the tag already could have been selected.
iceman1001 [Sun, 31 May 2015 19:47:33 +0000 (21:47 +0200)]
ADD: @marshmellow42 's changes / fixes.
iceman1001 [Sun, 31 May 2015 19:46:25 +0000 (21:46 +0200)]
ADD: a script to dump a specific type of Mifare Mini tags.
iceman1001 [Wed, 27 May 2015 21:23:46 +0000 (23:23 +0200)]
CHG: @marshmellow42 changes on deviceside.
ADD: increase debuglevel for printing a statment in ul_ev1_auth
iceman1001 [Tue, 26 May 2015 19:51:18 +0000 (21:51 +0200)]
ADD: aes128_encrypt ECB in scripting.c
ADD: aes128_decrypt ECB in scripting.c
ADD: Sha1Hex method in utils.lua
iceman1001 [Tue, 26 May 2015 14:12:33 +0000 (16:12 +0200)]
ADD: SHA1 hashes calculations in sha1.c and LUA
iceman1001 [Tue, 26 May 2015 09:05:57 +0000 (11:05 +0200)]
CHG: print up to 20 possible keys.
iceman1001 [Tue, 26 May 2015 09:04:57 +0000 (11:04 +0200)]
CHG: moved a xor function into util.c
CHG: added some calls to clearCommandBuffer() in /hf mfu/hf 14a sim/hf mf sim/ commands.
CHG: minor adjustments to relative pathing.
iceman1001 [Mon, 25 May 2015 11:16:10 +0000 (13:16 +0200)]
FIX: one too many parenthesis
iceman1001 [Mon, 25 May 2015 11:13:06 +0000 (13:13 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/mifarecmd.c
client/cmdhfmf.c
iceman1001 [Mon, 25 May 2015 11:10:55 +0000 (13:10 +0200)]
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".
Martin Holst Swende [Sun, 24 May 2015 21:10:21 +0000 (23:10 +0200)]
Merge pull request #107 from p-l-/fix-hfmf
Fix filenames for hf mf cload / csave
Pierre LALET [Sun, 24 May 2015 20:43:08 +0000 (22:43 +0200)]
Fix filenames for hf mf cload / csave
iceman1001 [Sun, 24 May 2015 19:51:44 +0000 (21:51 +0200)]
FIX: hf mfu dump, now reads correct memory from device-side.
CHG: hf mfu dump - output data styled :)
iceman1001 [Sun, 24 May 2015 19:50:15 +0000 (21:50 +0200)]
FIX: ELOAD/ESAVE/CLOAD/CSAVE filename bufferoverflow, and filename generation if UID not readable.
Thanks @p-l-
ref: https://github.com/Proxmark/proxmark3/commit/
0b14440dce5d879fed70afb455b1f7c56ee85b1e
Martin Holst Swende [Sun, 24 May 2015 19:32:11 +0000 (21:32 +0200)]
Merge pull request #106 from p-l-/fix-hfmfeload
Fix filenames for hf mf esave / eload
Pierre LALET [Sun, 24 May 2015 18:14:22 +0000 (20:14 +0200)]
Fix filenames for hf mf esave / eload
Martin Holst Swende [Sun, 24 May 2015 05:22:09 +0000 (07:22 +0200)]
Merge pull request #102 from marshmellow42/master
fix mfu dump getbigbuffer bug
marshmellow42 [Sun, 24 May 2015 02:35:50 +0000 (22:35 -0400)]
fix mfu dump getbigbuffer bug
Thanks @iceman1001 for catching my oops, and fixing it :)
iceman1001 [Sat, 23 May 2015 06:38:46 +0000 (08:38 +0200)]
Adjustments after the big merge from PM3 master.
iceman1001 [Sat, 23 May 2015 06:16:40 +0000 (08:16 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
README.txt
armsrc/appmain.c
armsrc/apps.h
armsrc/des.c
armsrc/iclass.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/cmddata.c
client/cmdhf.c
client/cmdhf14a.c
client/cmdhficlass.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/cmdscript.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/scripting.c
client/util.c
common/protocols.h
include/usb_cmd.h
Martin Holst Swende [Fri, 22 May 2015 19:55:34 +0000 (21:55 +0200)]
Merge pull request #101 from marshmellow42/master
hf mfu updates + hf search + bug fixes
marshmellow42 [Fri, 22 May 2015 17:17:51 +0000 (13:17 -0400)]
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...)
marshmellow42 [Fri, 22 May 2015 11:29:18 +0000 (07:29 -0400)]
mfu info authkeyptr fix
didn't follow @iceman1001 s l parameter changes fully... fixed now..
:)
iceman1001 [Fri, 22 May 2015 06:48:23 +0000 (08:48 +0200)]
FIX: camelcase on a variable caused some issues.
marshmellow42 [Fri, 22 May 2015 04:15:57 +0000 (00:15 -0400)]
fix to dump cmd print keys.
add l option to info cmd.
add ascii print to dump (screen only)
other minor clean up
iceman1001 [Thu, 21 May 2015 21:17:01 +0000 (23:17 +0200)]
FIX; the "L" optional parameter for swapping endianess on used authentication key. It is now implemented for following commands.
"HF MFU INFO"
"HF MFU DUMP"
"HF MFU RDBL"
"HF MFU WRBL"
CHG; I commented away the option to add the key to the dump, since it is not written in big-endian, like the data is on ULC. This needs to be addressed before it comes back. I like the idea of having keys inside the dumps on the correct places.
marshmellow42 [Thu, 21 May 2015 15:17:01 +0000 (11:17 -0400)]
hf mfu bug fixes, and help text fixes
iceman1001 [Wed, 20 May 2015 21:52:56 +0000 (23:52 +0200)]
FIX: call the wrong usage_hf_mfu method.
CHG: minor help text changes.
iceman1001 [Wed, 20 May 2015 21:44:11 +0000 (23:44 +0200)]
CHG: Merged the "hf mfu rdbl" and "hf mfu crdbl" commands into "hf mfu rdbl". One read command.
CHG: Merged the "hf mfu wrbl" and "hf mfu cwrbl" commands into "hf mfu wrbl". One write command.
Both new commands implement a help, authentication (0x1A/0x1B) for ULC and the rest,
marshmellow42 [Wed, 20 May 2015 20:47:40 +0000 (16:47 -0400)]
further mfu info updates
needed to auth select when a command failed for locked tags.
some output cleanups from @iceman1001
iceman1001 [Wed, 20 May 2015 20:04:40 +0000 (22:04 +0200)]
CHG: making sure all outputs follow the same pattern in "hf mfu info"
iceman1001 [Wed, 20 May 2015 19:44:22 +0000 (21:44 +0200)]
FIX: made the authentication part a bit clearer. It now uses two booleans to seperate which type of authentication was requested from user.
marshmellow42 [Wed, 20 May 2015 19:42:58 +0000 (15:42 -0400)]
finish NTAG i2c +...
thanks iceman
marshmellow42 [Wed, 20 May 2015 19:41:48 +0000 (15:41 -0400)]
finish NTAG i2c +...
thanks @iceman1001
iceman1001 [Wed, 20 May 2015 19:03:58 +0000 (21:03 +0200)]
ADD: @marshmellow42 latest fixes,
CHG: change name to fancey "NTAG I²C 1K"
marshmellow42 [Wed, 20 May 2015 18:22:26 +0000 (14:22 -0400)]
ULEV1_48 had the wrong max block
marshmellow42 [Wed, 20 May 2015 18:17:43 +0000 (14:17 -0400)]
minor adjustments to hf mfu
marshmellow42 [Wed, 20 May 2015 18:06:46 +0000 (14:06 -0400)]
Add NTAG i2c and bug fix
also streamlined select tag code
iceman1001 [Wed, 20 May 2015 17:26:11 +0000 (19:26 +0200)]
CHG: the new NTAG_i2c_1K enums, broke the uint16_t size.. Had to go up one level.
iceman1001 [Wed, 20 May 2015 17:20:26 +0000 (19:20 +0200)]
CHG: @marshmellows changes.
ADD: NTAG i2c 1K / NTAG i2c 2K identification.
marshmellow42 [Wed, 20 May 2015 15:27:44 +0000 (11:27 -0400)]
Add ntag 210, 212, 203 and bug fix
iceman1001 [Wed, 20 May 2015 12:09:40 +0000 (14:09 +0200)]
ADD: NTAG_210, NTAG_212 support / identification. @marshmellow42 's idea.
iceman1001 [Wed, 20 May 2015 08:36:55 +0000 (10:36 +0200)]
CHG: "hf mfu info" now always tries to read the NDEF CC. (was restricted to only NTAG213,215,216 before)
iceman1001 [Tue, 19 May 2015 19:45:06 +0000 (21:45 +0200)]
FIX: comment out a #include to reveng (my experiment)
ADD: Started to add a NTAG203 identification. Its a hard tag to pinpoint. Doesn't have GET_VERSION,
marshmellow42 [Tue, 19 May 2015 19:03:35 +0000 (15:03 -0400)]
missed file in previous commit...
duh...
iceman1001 [Tue, 19 May 2015 16:46:38 +0000 (18:46 +0200)]
@Marshmellow42 's fixes for bigbuf.
marshmellow42 [Tue, 19 May 2015 15:30:50 +0000 (11:30 -0400)]
hf mfu dump - bigbuf allocation fix
some larger nfc tags can get large so set the allocation to the 4k
CARD_MEMORY_SIZE buffersize.
iceman1001 [Tue, 19 May 2015 06:56:53 +0000 (08:56 +0200)]
CHG: the device-side code for "hf 14a sim x"
BUG: bcc1 xored error fix in "hf mf sim"
CHG: function rename Snoop -> Sniff.
marshmellow42 [Tue, 19 May 2015 02:07:11 +0000 (22:07 -0400)]
@iceman1001 s comments/updates mfu cmds
iceman1001 [Mon, 18 May 2015 18:58:33 +0000 (20:58 +0200)]
@Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses bigbuffer now, and can dump NTAG216 :)
Consistency on the client-side code "hf mfu". looks nice.
marshmellow42 [Mon, 18 May 2015 17:11:00 +0000 (13:11 -0400)]
MF ultralight code cleanup
marshmellow42 [Mon, 18 May 2015 00:49:25 +0000 (20:49 -0400)]
Iceman1001 s MFU clean up
cleaned up MF UL_C auth code device side.
iceman1001 [Sat, 16 May 2015 13:37:27 +0000 (15:37 +0200)]
CHG: the name change from "HF 14A SNOOP" -> "HF 14A SNIFF"
iceman1001 [Sat, 16 May 2015 13:36:40 +0000 (15:36 +0200)]
ADD: experimantal test of adding "reveng 1.30" source code into the PM3 Client.
iceman1001 [Sat, 16 May 2015 13:34:01 +0000 (15:34 +0200)]
CHG: the "HF MFU" authentication changes.
CHG: name change from "hf 14a snoop" -> "hf 14a sniff"..
iceman1001 [Sat, 16 May 2015 13:32:43 +0000 (15:32 +0200)]
chg: for the "hf mfu" authentication changes.
iceman1001 [Sat, 16 May 2015 13:30:17 +0000 (15:30 +0200)]
chg: @marshmellows changes to "hf 14a reader"
add: the experimental "hf 14a sim x" attack impl.
chg: sorry, but I never liked that sniffing was called snooping in this command. So I changed it to "sniff".
iceman1001 [Sat, 16 May 2015 13:27:53 +0000 (15:27 +0200)]
add: @marshmellow changes,
chg: remade the authentication for ULC..
marshmellow42 [Sat, 16 May 2015 05:00:31 +0000 (01:00 -0400)]
mfu info / dump attempt at missing auths
NOT TESTED. will test soon. probably has bugs!
marshmellow42 [Fri, 15 May 2015 05:19:58 +0000 (01:19 -0400)]
mfu dump - beginning of additions
marshmellow42 [Fri, 15 May 2015 04:57:51 +0000 (00:57 -0400)]
hf mfu dump testing
marshmellow42 [Fri, 15 May 2015 02:55:18 +0000 (22:55 -0400)]
@iceman1001 s default keys
marshmellow42 [Thu, 14 May 2015 01:36:20 +0000 (21:36 -0400)]
@iceman1001 's updated lualibs
marshmellow42 [Thu, 14 May 2015 01:20:23 +0000 (21:20 -0400)]
@iceman1001 updated scripts
marshmellow42 [Thu, 14 May 2015 01:14:35 +0000 (21:14 -0400)]
scripting updates from @iceman1001
it compiles but i'm not sure how to fully test it...
:)
iceman1001 [Wed, 13 May 2015 18:16:18 +0000 (20:16 +0200)]
ADD: @marshmellows fixes
marshmellow42 [Wed, 13 May 2015 15:22:27 +0000 (11:22 -0400)]
minor hf mfu info adjustment from @iceman1001
marshmellow42 [Wed, 13 May 2015 15:14:17 +0000 (11:14 -0400)]
@iceman1001 s coverity scan fixes
marshmellow42 [Wed, 13 May 2015 15:07:47 +0000 (11:07 -0400)]
various bug fixes
iceman1001 [Wed, 13 May 2015 13:48:32 +0000 (15:48 +0200)]
@marshmellow42 ideas
FIX: removed some unneeded calls to ul_switch_off_field.
FIX: once again the OTP is printed nevertheless if its a NDEF CC
iceman1001 [Wed, 13 May 2015 12:08:59 +0000 (14:08 +0200)]
BUGS: more Coverity scan fixes.
iceman1001 [Wed, 13 May 2015 11:23:53 +0000 (13:23 +0200)]
BUGS: Coverty Scan, fixes some memory bugs
iceman1001 [Wed, 13 May 2015 07:18:37 +0000 (09:18 +0200)]
minor code clean up
iceman1001 [Wed, 13 May 2015 07:15:53 +0000 (09:15 +0200)]
a minor clean up when printing the key
iceman1001 [Wed, 13 May 2015 07:13:42 +0000 (09:13 +0200)]
Added @marshmellow42 "hf search"