iceman1001 [Tue, 6 Jan 2015 20:20:41 +0000 (21:20 +0100)]
ADD: tnp3xxx identification in luascripts.
CHG: minor code clean up.
iceman1001 [Tue, 6 Jan 2015 20:08:20 +0000 (21:08 +0100)]
CHG: Refactored the HF MFU udump/ucdump commands into one method.
iceman1001 [Tue, 6 Jan 2015 19:51:11 +0000 (20:51 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
marshmellow42 [Tue, 6 Jan 2015 19:28:59 +0000 (14:28 -0500)]
Merge pull request #4 from Proxmark/master
resync fork to master
Martin Holst Swende [Tue, 6 Jan 2015 17:59:59 +0000 (18:59 +0100)]
Changed io threshold to 140, fixed boolean error in comparison
Martin Holst Swende [Tue, 6 Jan 2015 17:43:37 +0000 (18:43 +0100)]
Fixed thresholding of io fskdemod
iceman1001 [Tue, 6 Jan 2015 16:43:31 +0000 (17:43 +0100)]
CHG: rename the HF MFU * commands.
ADD: added a HF MFU INFO commmand, where you can see some tag info. Used to be in the readcard command.
FIX: minor code clean up for ultralight & desfire commands in armsrc/mifarecmd.c, armsrc/mifaredesfire.c, armsrc/mifareutil.c
CHG: Lowered the default MF_DBGLEVEL, it set to MF_DBG_ERROR.
CHG: lowered a testing value for timeout in cmdhf14a.c
marshmellow42 [Tue, 6 Jan 2015 16:02:11 +0000 (11:02 -0500)]
Merge pull request #3 from Proxmark/master
re sync with masterB
marshmellow42 [Tue, 6 Jan 2015 15:58:35 +0000 (10:58 -0500)]
sync with master lf files to resolve conflicts
iceman1001 [Tue, 6 Jan 2015 14:36:33 +0000 (15:36 +0100)]
FIX: a compilation error for a static method in CmdHF14A.h
marshmellow42 [Tue, 6 Jan 2015 14:20:36 +0000 (09:20 -0500)]
added data psk* cmds for pskdemod
fixed a couple small bugs in other lf functions as well including
detectaskclock, stopped changes from being made to graphbuffer.
iceman1001 [Tue, 6 Jan 2015 10:17:02 +0000 (11:17 +0100)]
ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
ADD: added a manufacturer list for hf 14a reader, only viable when UID is double or triple size. Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
iceman1001 [Mon, 5 Jan 2015 14:51:27 +0000 (15:51 +0100)]
CHG: generic code clean up. Removal of commented code.
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD: tnp3xx support
ADD: nxp tag idents.
ADD: identifiction of chinese backdoor commands to hf 14a reader.
iceman1001 [Mon, 5 Jan 2015 14:12:48 +0000 (15:12 +0100)]
FIX: downloaded a fresh clone from my fork, and took away the build-errors.
Martin Holst Swende [Mon, 5 Jan 2015 08:16:06 +0000 (09:16 +0100)]
Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests
iceman1001 [Mon, 5 Jan 2015 01:01:24 +0000 (02:01 +0100)]
ADD: Holimans new changes in master.
iceman1001 [Sun, 4 Jan 2015 22:43:07 +0000 (23:43 +0100)]
FIX: fixed a little bug I introduced from last commit in fskdemod
CHG: tab fixes in cmdlf.c and minor code clean up
CHG: minor variable name change, printstatement in cmddata.c
iceman1001 [Sun, 4 Jan 2015 21:49:54 +0000 (22:49 +0100)]
FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works.
FIX: changed the DetectASKClock in lfdemod.c to correct detect all clocks in the array.
CHG: I like code with more spaces inside of it and tried change some stuff according to our codestyle in HACKING.txt
ADD: some zero checks and overflows, god knows where it was.
The T55XX commands will be rewritten to use Marshmellows lfdemod.c instead.
CHG: Made the graph window smaller.
CHG: lf read now does a "data samples" also. (less writing commands)
CHG: data samples now defaults to samples size of 20000
Martin Holst Swende [Sun, 4 Jan 2015 21:10:25 +0000 (22:10 +0100)]
Moved iclass crc to be based on a lookup table
Martin Holst Swende [Sun, 4 Jan 2015 20:26:10 +0000 (21:26 +0100)]
Minor dox
Martin Holst Swende [Sun, 4 Jan 2015 20:22:54 +0000 (21:22 +0100)]
Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands
Martin Holst Swende [Sun, 4 Jan 2015 13:53:26 +0000 (14:53 +0100)]
Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle
Martin Holst Swende [Sat, 3 Jan 2015 14:11:48 +0000 (15:11 +0100)]
Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed
Martin Holst Swende [Sat, 3 Jan 2015 13:36:38 +0000 (14:36 +0100)]
Set lower threshold for lf iodemod, it had too high threshold for filtering out noise. Now it works better at least with my antenna/setup
Martin Holst Swende [Sat, 3 Jan 2015 13:29:22 +0000 (14:29 +0100)]
Fixed indentation
Martin Holst Swende [Sat, 3 Jan 2015 13:29:07 +0000 (14:29 +0100)]
Removed unused variable
Martin Holst Swende [Sat, 3 Jan 2015 13:21:07 +0000 (14:21 +0100)]
Corrected indentation to tabs only
Martin Holst Swende [Sat, 3 Jan 2015 13:16:05 +0000 (14:16 +0100)]
Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops
iceman1001 [Thu, 1 Jan 2015 23:09:59 +0000 (00:09 +0100)]
chg: updated the README.txt
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.
Iceman [Thu, 1 Jan 2015 22:02:23 +0000 (23:02 +0100)]
Merge pull request #1 from bforbort/master
Added DES AUTH command support
Blaine Forbort [Thu, 1 Jan 2015 18:41:14 +0000 (10:41 -0800)]
Merge remote-tracking branch 'origin/DESFireAuth'
iceman1001 [Thu, 1 Jan 2015 13:07:42 +0000 (14:07 +0100)]
Updated the README.txt
CHG: added marshmellows last changes with rtrim, and minor fixes.
DEL: code cleanup in usb_cdc.c
Martin Holst Swende [Thu, 1 Jan 2015 12:46:48 +0000 (13:46 +0100)]
Merge pull request #34 from marshmellow42/master
Fsk demod fixes and additions to client for offline demoding
marshmellow42 [Wed, 31 Dec 2014 20:24:37 +0000 (15:24 -0500)]
Revert "problems creating pull request with the new traces"
This reverts commit
e33b652c535be95344724728a0b9dd1f3cf87587.
marshmellow42 [Wed, 31 Dec 2014 20:16:02 +0000 (15:16 -0500)]
problems creating pull request with the new traces
will add these traces later
marshmellow42 [Wed, 31 Dec 2014 19:55:58 +0000 (14:55 -0500)]
minor adjustment to askmandemod for lf search
returns false if it finds data but not an EM410x format.
marshmellow42 [Wed, 31 Dec 2014 19:43:49 +0000 (14:43 -0500)]
added data rtrim command
enter location to trim all samples after
iceman1001 [Wed, 31 Dec 2014 11:01:00 +0000 (12:01 +0100)]
CHG: modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with "data load". ie: "lf search 1" == take data from previously loaded.
iceman1001 [Wed, 31 Dec 2014 10:35:43 +0000 (11:35 +0100)]
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.
marshmellow42 [Wed, 31 Dec 2014 07:27:30 +0000 (02:27 -0500)]
lf demod code cleanup - added fskraw arguments
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
marshmellow42 [Tue, 30 Dec 2014 21:08:33 +0000 (16:08 -0500)]
LF demod/cmd code cleanup + new lf search
cleaned up and error proof code. plus added new command lf search
when online it will lf read - data samples 20000 - and test for EM410x,
HID, IO Prox, and indala cards. when offline it will test current
graphbuffer.
marshmellow42 [Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)]
Merge pull request #1 from Proxmark/master
Test
marshmellow42 [Mon, 29 Dec 2014 20:58:59 +0000 (15:58 -0500)]
minor setting adjustments/cleanup
clean up code
marshmellow42 [Mon, 29 Dec 2014 20:32:53 +0000 (15:32 -0500)]
LF Demod bug fixes and add lf em em410xdemod
fixed a few bugs in lf demod that the streamlining added. added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
marshmellow42 [Mon, 29 Dec 2014 02:29:33 +0000 (21:29 -0500)]
slight adjustment to include
removed extra unneeded path
marshmellow42 [Mon, 29 Dec 2014 01:33:32 +0000 (20:33 -0500)]
LF Demod streamlining
one shared location for demoding lf for arm and client. also added a
few raw demod commands.
iceman1001 [Fri, 26 Dec 2014 21:38:23 +0000 (22:38 +0100)]
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)
iceman1001 [Fri, 26 Dec 2014 20:32:58 +0000 (21:32 +0100)]
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.
iceman1001 [Fri, 26 Dec 2014 19:02:59 +0000 (20:02 +0100)]
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.
marshmellow42 [Wed, 24 Dec 2014 18:01:09 +0000 (13:01 -0500)]
rename askrawdemod to askmandemod
marshmellow42 [Wed, 24 Dec 2014 16:48:41 +0000 (11:48 -0500)]
Created new detectclock function + EM decode addons
new detectclock is somewhat more reliable for ASK modulated tags. added
this detect to askrawdemod if no clock in passed as an argument. also
added more EM ID formats to output
marshmellow42 [Tue, 23 Dec 2014 20:16:53 +0000 (15:16 -0500)]
minor askrawdemod adjustment if errors in demoding are found
if it can't find a demod position with no errors it will find the one
with fewest errors and mark errors with 77.
marshmellow42 [Tue, 23 Dec 2014 17:00:13 +0000 (12:00 -0500)]
Add auto check for EM410x format to askrawdemod cmd
added EM410x format check and print to the data askrawdemod command. if
it finds valid em410x format & parities it will print the EM ID and
Unique ID and a few others.
pwpiwi [Tue, 23 Dec 2014 10:44:41 +0000 (11:44 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Tue, 23 Dec 2014 10:26:10 +0000 (11:26 +0100)]
Merge branch 'master' of https://github.com/pwpiwi/proxmark3
pwpiwi [Tue, 23 Dec 2014 10:11:52 +0000 (11:11 +0100)]
bugfixes in iso14443a.c and hf 14a reader
- introduced with the big frame and parity support (commit
6a1f2d82): tag responses with len%8 == 0 were dropped - thanks iceman for testing and finding
- after unsuccessful hf 14a reader the field stayed on. Thanks to iceman for proposing the fix.
pwpiwi [Tue, 23 Dec 2014 10:11:52 +0000 (11:11 +0100)]
fixed a bug in iso14443a.c which had been introduced with the big frame and parity support (commit
6a1f2d82) - thanks iceman for finding and testing
marshmellow42 [Tue, 23 Dec 2014 03:50:13 +0000 (22:50 -0500)]
minor fix - got too comment happy removing test code
should not have commented this code out
marshmellow42 [Mon, 22 Dec 2014 22:46:28 +0000 (17:46 -0500)]
added new data askrawdemod command
added new data askrawdemod command returned data fskdemod and separated
out new fskrawdemod commands
iceman1001 [Mon, 22 Dec 2014 14:14:05 +0000 (15:14 +0100)]
added the changes from PM3 master.
added some code for the AWID26
Blaine Forbort [Mon, 22 Dec 2014 08:21:20 +0000 (00:21 -0800)]
Using defined command code
Blaine Forbort [Mon, 22 Dec 2014 07:54:29 +0000 (23:54 -0800)]
Minor formatting change
Blaine Forbort [Mon, 22 Dec 2014 07:41:15 +0000 (23:41 -0800)]
Remove unrelated file
Blaine Forbort [Mon, 22 Dec 2014 06:59:24 +0000 (22:59 -0800)]
Tested by changing the master key from the default to a custom value
Blaine Forbort [Sun, 21 Dec 2014 03:25:31 +0000 (19:25 -0800)]
code to check RndA' from PICC was unreachable
Blaine Forbort [Sun, 21 Dec 2014 03:15:48 +0000 (19:15 -0800)]
Called the OnSuccess() method for whatever reason that's there.
Blaine Forbort [Sun, 21 Dec 2014 01:18:26 +0000 (17:18 -0800)]
Limit to single-DES operation and return session key to client.
pwpiwi [Sat, 20 Dec 2014 20:56:12 +0000 (21:56 +0100)]
Merge pull request #33 from pwpiwi/master
Support for bigger iso14443 frames (including parity calculation)
unify hw tune and data tune
fix hf epa cnonces
adapt hf iclass list to new trace format
pwpiwi [Sat, 20 Dec 2014 17:46:13 +0000 (18:46 +0100)]
adapted hf iclass list to new trace format
Blaine Forbort [Sat, 20 Dec 2014 08:10:59 +0000 (00:10 -0800)]
Create session key
Blaine Forbort [Sat, 20 Dec 2014 05:37:06 +0000 (21:37 -0800)]
Accept key number from command line
Blaine Forbort [Sat, 20 Dec 2014 04:38:25 +0000 (20:38 -0800)]
Removed unneeded verbosity and checked for a 0x00 response from PICC after challenge response
Blaine Forbort [Sat, 20 Dec 2014 03:44:32 +0000 (19:44 -0800)]
Challenge is now sent to PICC
Blaine Forbort [Sat, 20 Dec 2014 03:36:19 +0000 (19:36 -0800)]
Calculates response to PICC challenge
Blaine Forbort [Fri, 19 Dec 2014 20:15:45 +0000 (12:15 -0800)]
Successfully decrypted RandB from PICC challenge
Blaine Forbort [Fri, 19 Dec 2014 20:15:04 +0000 (12:15 -0800)]
Added file demonstrating a singleDES AUTH operation using 'hf 14a raw' command
Blaine Forbort [Fri, 19 Dec 2014 20:13:18 +0000 (12:13 -0800)]
Fixed build environment
marshmellow42 [Fri, 19 Dec 2014 17:39:41 +0000 (12:39 -0500)]
put ask demod and mandemod
put ask demod and mandemod back until i have time to test it
marshmellow42 [Fri, 19 Dec 2014 17:14:27 +0000 (12:14 -0500)]
Final touches on IO prox and HID prox demod
makes both more robust and handles various error situations.
iceman1001 [Fri, 19 Dec 2014 12:46:02 +0000 (13:46 +0100)]
ADD: started with adding a LF AWID26 write function. not done yet.
ADD: latest pwpiwi & holiman changes.
pwpiwi [Thu, 18 Dec 2014 18:42:49 +0000 (19:42 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Thu, 18 Dec 2014 18:40:35 +0000 (19:40 +0100)]
bugfixes hf epa cnonces
- extended length (more than 1 byte) not handled correctly
- nonces not printed on Windows due to type mismatch
pwpiwi [Thu, 18 Dec 2014 18:39:16 +0000 (19:39 +0100)]
Format hf 14a list output for bigger frame sizes
Martin Holst Swende [Thu, 18 Dec 2014 13:46:38 +0000 (14:46 +0100)]
minor change
Martin Holst Swende [Thu, 18 Dec 2014 13:41:17 +0000 (14:41 +0100)]
Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data
Martin Holst Swende [Thu, 18 Dec 2014 07:56:26 +0000 (08:56 +0100)]
Merge pull request #32 from marshmellow42/master
Fixes and additions to lf io fskdemod and addon parameter to lf hid fskdemod
iceman1001 [Wed, 17 Dec 2014 21:26:16 +0000 (22:26 +0100)]
minor fixes regaring the newly released patches from the pm3 community
plus removed old comments in cmdmain.c
pwpiwi [Wed, 17 Dec 2014 16:38:13 +0000 (17:38 +0100)]
unify/refactor hw tune and data tune
- unified hw tune and Enio's great data tune
- don't use BigBuf (and hardcoded Offset)
- removed special handling of CMD_MEASURED_ANTENNA_TUNING
in UsbCommandReceived()
iceman1001 [Wed, 17 Dec 2014 19:33:21 +0000 (20:33 +0100)]
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.
marshmellow42 [Wed, 17 Dec 2014 14:51:40 +0000 (09:51 -0500)]
LF HID & IO prox fixes/options
pwpiwi [Tue, 16 Dec 2014 06:47:02 +0000 (07:47 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Tue, 16 Dec 2014 06:41:07 +0000 (07:41 +0100)]
bugfixes iso14443a (hf 14a commands)
- buffers were too small to handle 256 byte frames
- parity bits were only handled for up to 32 byte frames
- trace format was inefficient
- removed parity calculation from decoders in iclass.c (parity not used on air anyway)
Martin Holst Swende [Sun, 14 Dec 2014 20:37:56 +0000 (21:37 +0100)]
Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0
Martin Holst Swende [Sun, 14 Dec 2014 17:07:38 +0000 (18:07 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Sun, 14 Dec 2014 17:07:12 +0000 (18:07 +0100)]
Fix (iclass)
marshmellow42 [Sun, 14 Dec 2014 01:23:59 +0000 (20:23 -0500)]
LF HID & IO prox demod translation addons
lf hid fskdemod - add bit format length, facility code and card numbers
for different formats
ikarus [Wed, 10 Dec 2014 18:10:12 +0000 (19:10 +0100)]
Merge pull request #31 from dnet/patch-1
Typofix: occurrences
András Veres-Szentkirályi [Wed, 10 Dec 2014 15:42:31 +0000 (16:42 +0100)]
Typofix: occurrences
It's spelled with two rs.
Martin Holst Swende [Sun, 30 Nov 2014 21:30:36 +0000 (22:30 +0100)]
Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060
iceman1001 [Sun, 30 Nov 2014 18:16:28 +0000 (19:16 +0100)]
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"