iceman1001
96e41bfcec
add: a .gitignore to be able to add the folder client/obj/reveng.
2015-06-14 23:32:20 +02:00
iceman1001
d7f3f65361
add: a .gitignore to be able to add the folder client/platforms.
2015-06-14 23:31:52 +02:00
iceman1001
2495281d14
fix; stupid fixes for some compiler warnings messages of unused variables..
2015-06-14 23:31:05 +02: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
32719adfa1
ADD: added support for some NTAG/EV1 commands to "hf 14a sim" on device side.
...
0x1B (authenticate)
0x3a (fast read)
0x60 (get_version)
This is used in a new mode on client, "hf 14a sim t 7"
2015-06-14 22:40:18 +02:00
iceman1001
c043981c04
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.
2015-06-14 17:19:41 +02:00
iceman1001
b4c1f167da
FIX: old bug back, and now fixed again. @marshmellow42
2015-06-14 17:18:22 +02: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
1417a7f9d0
minor textual changes from @marshmellow42
2015-06-13 12:14:38 +02:00
iceman1001
550a929a69
FIX: Reverting the t55x7 timings. (@marshmellow42 's fix)
2015-06-13 12:13:21 +02:00
iceman1001
99789601dc
ADD: @marshmellow42 's new "-g" search for crc in a hexstring *great*
...
ADD: fixes in the reveng calling methods
2015-06-10 08:46:16 +02:00
iceman1001
68ff832584
fix: nice output..
2015-06-09 21:46:22 +02:00
iceman1001
dd1df4901d
@marshmellows memory fixes for reveng1.30 in client..
2015-06-09 21:32:22 +02:00
iceman1001
817d709615
@marshmellows memory fix
2015-06-09 21:29:24 +02:00
iceman1001
d352146782
CHG: minor layout and call fixes to e.lua (the test script for hooking up reveng1.30)
2015-06-09 21:28:06 +02:00
iceman1001
60e8657796
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.
2015-06-09 13:31:53 +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
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
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
47286d89e4
ADD @pwpiwi 's fixes for "HF 14B" commands.
2015-06-03 21:12:55 +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
77533e21ae
DEL: removed old iso14443.c since @pwpiwi renamed it..
2015-06-02 12:23:06 +02:00
iceman1001
4abb052f38
CHG: removed an extra fclose call
2015-06-02 12:20:48 +02:00
iceman1001
1c6e7f0393
ADD: @marshmellow42 's infineon MY D(tm) MOVE LEAN tag identification
2015-06-02 12:20:16 +02:00
iceman1001
d31d3804fe
CHG: help text output was not aligned because of tabs/spaces
2015-06-02 12:18:54 +02:00
iceman1001
489ef36cf6
ADD: @pwpiwi 's fixes for 14b. Including a rename from iso14443.c -> iso14443b.c
2015-06-02 12:17:34 +02:00
iceman1001
af3b8b2dc6
CHG: remade selftest structure
...
CHG: removed debugstatements
2015-05-31 22:33:12 +02:00
iceman1001
e86a89044a
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.
2015-05-31 21:49:00 +02:00
iceman1001
2d2f7d1948
ADD: @marshmellow42 's changes / fixes.
2015-05-31 21:47:33 +02:00
iceman1001
7142c87e1f
ADD: a script to dump a specific type of Mifare Mini tags.
2015-05-31 21:46:25 +02:00
iceman1001
95aeb706d7
CHG: @marshmellow42 changes on deviceside.
...
ADD: increase debuglevel for printing a statment in ul_ev1_auth
2015-05-27 23:23:46 +02:00
iceman1001
b18948fd92
ADD: aes128_encrypt ECB in scripting.c
...
ADD: aes128_decrypt ECB in scripting.c
ADD: Sha1Hex method in utils.lua
2015-05-26 21:51:18 +02:00
iceman1001
ea75b30c81
ADD: SHA1 hashes calculations in sha1.c and LUA
2015-05-26 16:12:33 +02:00
iceman1001
b69947c245
CHG: print up to 20 possible keys.
2015-05-26 11:05:57 +02:00
iceman1001
c3c241f389
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.
2015-05-26 11:04:57 +02:00
iceman1001
7c60a801d6
FIX: one too many parenthesis
2015-05-25 13:16:10 +02:00
iceman1001
c068ebb78f
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/mifarecmd.c
client/cmdhfmf.c
2015-05-25 13:13:06 +02:00
iceman1001
46cd801c5a
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".
2015-05-25 13:10:55 +02:00
Martin Holst Swende
96c4f5517e
Merge pull request #107 from p-l-/fix-hfmf
...
Fix filenames for hf mf cload / csave
2015-05-24 23:10:21 +02:00
Pierre LALET
292fe72535
Fix filenames for hf mf cload / csave
2015-05-24 22:43:08 +02:00
iceman1001
7444d916c6
FIX: hf mfu dump, now reads correct memory from device-side.
...
CHG: hf mfu dump - output data styled :)
2015-05-24 21:51:44 +02:00
iceman1001
d23f3f2c9a
FIX: ELOAD/ESAVE/CLOAD/CSAVE filename bufferoverflow, and filename generation if UID not readable.
...
Thanks @p-l-
ref: 0b14440dce
2015-05-24 21:50:15 +02:00
Martin Holst Swende
cae00c59ff
Merge pull request #106 from p-l-/fix-hfmfeload
...
Fix filenames for hf mf esave / eload
2015-05-24 21:32:11 +02:00
Pierre LALET
0b14440dce
Fix filenames for hf mf esave / eload
2015-05-24 20:14:22 +02:00
Martin Holst Swende
f0eaac9aca
Merge pull request #102 from marshmellow42/master
...
fix mfu dump getbigbuffer bug
2015-05-24 07:22:09 +02: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
iceman1001
ce432659f2
Adjustments after the big merge from PM3 master.
2015-05-23 08:38:46 +02:00
iceman1001
bcf61bd34a
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
2015-05-23 08:16:40 +02:00
