Commit graph

833 commits

Author SHA1 Message Date
Iceman
7c5f70dd9f Merge pull request #1 from bforbort/master
Added DES AUTH command support
2015-01-01 23:02:23 +01:00
Blaine Forbort
23b80a7334 Merge remote-tracking branch 'origin/DESFireAuth' 2015-01-01 10:41:14 -08:00
iceman1001
0a966150a0 Updated the README.txt
CHG:  added marshmellows last changes with rtrim, and minor fixes.
DEL:  code cleanup in usb_cdc.c
2015-01-01 14:07:42 +01:00
iceman1001
c579a5871e CHG: modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with "data load". ie: "lf search 1" == take data from previously loaded. 2014-12-31 12:01:00 +01:00
iceman1001
6ff6ade2f5 ADD: midnitesnakes desfire, ultralight changes from Unstable branch.
ADD: Marshmellows fixes for the LF (demods) commands,  (LF SEACH)
ADD: Holimans changes with hash1_brute

FIXES:  minor fixes with some calls to "free" and redundant debug statement and code cleanup. removal of commented code.
2014-12-31 11:35:43 +01:00
iceman1001
9c7c222c03 FIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field and the consequent changes to the define names. (CMD_MIFARE_EML_CGETBLO -> CMD_MIFARE_CGETBLO) 2014-12-26 22:38:23 +01:00
iceman1001
d52e4e8819 ADD: HF 14A READER is now able to see if a presented card responses to the chinese magic backdoor commands.
FIX: simple namechange of some defines where it hinted it was related to "eml" when it wasn't.
2014-12-26 21:32:58 +01:00
iceman1001
1b492a97af ADD: marshmellows new lf command and DetectClock. (works great!)
FIX: a suggested patch for "hf mf csetuid" (https://github.com/Proxmark/proxmark3/issues/35)
FIX: fixed a bug in iso14443a_select_card where the len variable wasnt set,  this made desfire/magic cards not work.
2014-12-26 20:02:59 +01:00
iceman1001
3bc3598e88 added the changes from PM3 master.
added some code for the AWID26
2014-12-22 15:14:05 +01:00
Blaine Forbort
082789c4df Using defined command code 2014-12-22 00:21:20 -08:00
Blaine Forbort
46e14b0f96 Minor formatting change 2014-12-21 23:54:29 -08:00
Blaine Forbort
f56bd0174a Remove unrelated file 2014-12-21 23:41:15 -08:00
Blaine Forbort
4e2e4bcf9b Tested by changing the master key from the default to a custom value 2014-12-21 22:59:24 -08:00
Blaine Forbort
0673263230 code to check RndA' from PICC was unreachable 2014-12-20 19:25:31 -08:00
Blaine Forbort
6a1aa12df0 Called the OnSuccess() method for whatever reason that's there. 2014-12-20 19:15:48 -08:00
Blaine Forbort
3c05723ee2 Limit to single-DES operation and return session key to client. 2014-12-20 17:18:26 -08:00
Blaine Forbort
085b0e2ea9 Create session key 2014-12-20 00:10:59 -08:00
Blaine Forbort
6534821365 Accept key number from command line 2014-12-19 21:37:06 -08:00
Blaine Forbort
a07a448220 Removed unneeded verbosity and checked for a 0x00 response from PICC after challenge response 2014-12-19 20:38:25 -08:00
Blaine Forbort
1051dee04a Challenge is now sent to PICC 2014-12-19 19:44:32 -08:00
Blaine Forbort
0127902ee6 Calculates response to PICC challenge 2014-12-19 19:36:19 -08:00
Blaine Forbort
b6f41bfdfe Successfully decrypted RandB from PICC challenge 2014-12-19 12:15:45 -08:00
Blaine Forbort
de9b66bc36 Added file demonstrating a singleDES AUTH operation using 'hf 14a raw' command 2014-12-19 12:15:04 -08:00
Blaine Forbort
b216af9a24 Fixed build environment 2014-12-19 12:13:18 -08:00
iceman1001
f5ed4d12de ADD: started with adding a LF AWID26 write function. not done yet.
ADD: latest pwpiwi & holiman changes.
2014-12-19 13:46:02 +01:00
iceman1001
d3499d369d minor fixes regaring the newly released patches from the pm3 community
plus removed old comments in cmdmain.c
2014-12-17 22:26:16 +01:00
iceman1001
a501c82b19 Applied Holiman's fixes for iclass.c and CSNs
Applied PwPiwi's new parity fix.
Applied Marshmellw's fixes for FSKdemod (HID, IO)

FIX: a potential bigbuffer fault given pwpiwi's change inside lfops.c CmdIOdemodFSK & CmdHIDdemodFSK
FIX: change some "int" parameters to uint's.
FIX: changed the lfops.c -  DoAcquisition125k_internal  to respect pwpiwi's definitions of FREE_BUFFER_OFFSET

HEADS up:  The ultralight functions hasn't been verified since pwpiwi's changes.
2014-12-17 20:33:21 +01:00
iceman1001
02306bac2d ADD: Enio's intuative function for the command: "hw tune", where you plot the tuning-data :)
ADD:  added optional parameter to "hw tune" to show graf direct. Sample usage: "hw tune p"
2014-11-30 19:16:28 +01:00
iceman1001
06b58a94f0 BUG: don't try to fix things that ain't broken.. or not. My try for a fix ended up making the PrintAndLog function stop working. Just by calling a fclose.. fixed. 2014-11-27 22:16:17 +01:00
iceman1001
95e635947b ADD: the option to simulate tnp3xxx inthe command "hf mf sim"
ADD: found some new default keys
ADD: changed alot of memorys buffers to use constant values.  like usbbuffer sizes, tracelogs, etc etc
ADD: all changes Peter filmoore has in his pull request.
2014-11-26 13:52:39 +01:00
iceman1001
463ca973e7 FIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to be loaded.
FIX: hf mf esave - now supports specifying  0,1,2,4 in card memory for the file to be saved.
ADD: data.h -  added FILE_PATH_SIZE constant
ADD: hf legic load - a command help and checks for FILE_PATH_SIZE
ADD: hf legis save - now checks for FILE_PATH_SIZE
ADD: lf hitag - now checks for FILE_PATH_SIZE
ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE
ADD: data load / save  - now checks for FILE_PATH_SIZE
FIX: ui.c - added a case of closing a filehandle
FIX: hf mf cload / csave now checks for FILE_PATH_SIZE
FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE
2014-11-16 11:22:06 +01:00
iceman1001
961658bba9 FIX: rewrote the help text, cleaned up the code 2014-11-14 13:32:11 +01:00
iceman1001
bd5d0f07e9 REN: renamed tnp3.lua to tnp3dump.lua since that name is more explainatory
ADD: added tnp3sim.lua  a script which loads a dump and sends it to the pm3 device memory.
2014-11-14 13:24:45 +01:00
iceman1001
b22f7a6bc6 FIX: Minor correction of variablename. don't even ask. 2014-11-13 22:23:30 +01:00
iceman1001
85578fcd4e FIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently changed "hf mf ekeyprn" 2014-11-13 22:21:39 +01:00
iceman1001
a0bf7ba787 FIX: The hf mf ekeyprn defaults to print all 40 sectorblocks of keys. (ie 4K card). Now its optional 1K / 4K and defaults to 1K. 2014-11-13 22:13:46 +01:00
iceman1001
5c065fa089 FIX: Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612 filepath too short in "hf mf eload / esave / cload / csave" commands. Length was 14, is now 250. Should be enough for awhile. 2014-11-13 22:02:36 +01:00
iceman1001
f91f0ebb35 CHG - some lua functions in utils.lua 2014-11-13 20:14:14 +01:00
iceman1001
47cbb2d418 ADD: tnp3.lua can now validate the checkums in the dump
ADD: added  CRC16 CCITT functionality to LUA
FIX: tnp3.lua is now correctly decryping data while dumping
2014-11-12 23:18:46 +01:00
iceman1001
f595de25e9 ADD: html_dumplib.lua, added the functionality to save text-files.
ADD: tnp3.lua, now will save the dumped data to BIN and EML
FIX: tnp3.lua, added some clearcommando buffer to help the pm3 not to be blocked
2014-11-10 21:46:21 +01:00
iceman1001
cd5767d43d FIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearrays in lua are tricky
ADD: utils.lua some functions to convert between ascii, bytes and strings.
2014-11-09 19:29:47 +01:00
iceman1001
22f1c57786 Updated tnp3.lua
added some possibilities to abort the "hf mf nested" command
added a rudimentary items identification for tnp3xxx
2014-11-09 17:22:04 +01:00
iceman1001
9b989c45b9 FIX: minor parseing bug when loading dumpkeys.bin file.
ADD:  added some useful helperfunctions to utils.lua
2014-11-05 19:16:54 +01:00
iceman1001
1a5ff2c2a7 FIX: fixed the layout of data in tnp3.lua 2014-11-03 22:29:43 +01:00
iceman1001
8aa79dee20 FIX: added some tnp3xxx identification i formatMifare.lua
FIX: tnp3.lua is more or less finished. Needs testing.
2014-11-03 21:59:31 +01:00
iceman1001
c70cef9734 fixing scripts/tnp3.lua 2014-11-03 15:25:54 +01:00
iceman1001
c15d2bdc9b ADD: added identification for Mifare TNP3xxx tags.
ADD: MD5-lua functionality
ADD: AES 128 decrypt lua functionality
ADD: test luc script for reading TNP3xxx tags
CHG: testing some changes for "hf 14b sim" / "lf em4x 410xsim"
2014-11-03 13:49:19 +01:00
iceman1001
a25d5c1cde test: hf 15 sim.. 2014-10-31 09:26:35 +01:00
iceman1001
0222acfcf3 ADD: Implemented a "hf 14b write" function using the CmdHF14BCmdRaw method. The function can write to SRI512 and SRIX4K tags only. Be extremly cautious when writing to Block 0xFF 2014-10-30 15:28:45 +01:00
iceman1001
5ea2c88515 FIX: maybe I should actually send the uid bytes with the command request.... 2014-10-30 14:29:31 +01:00