marshmellow42
389d0360e1
Merge pull request #3 from Proxmark/master
...
re sync with masterB
2015-01-06 11:02:11 -05:00
marshmellow42
1c4b102cd5
sync with master lf files to resolve conflicts
2015-01-06 10:58:35 -05:00
iceman1001
dd683ece72
FIX: a compilation error for a static method in CmdHF14A.h
2015-01-06 15:36:33 +01:00
marshmellow42
5644791bdb
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.
2015-01-06 09:20:36 -05:00
iceman1001
10403a6a30
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.
2015-01-06 11:17:02 +01:00
iceman1001
3fe4ff4f03
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.
2015-01-05 15:51:27 +01:00
iceman1001
0452ec6c90
FIX: downloaded a fresh clone from my fork, and took away the build-errors.
2015-01-05 15:12:48 +01:00
Martin Holst Swende
6f101995b6
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
2015-01-05 09:16:06 +01:00
iceman1001
d3a22c7dfa
ADD: Holimans new changes in master.
2015-01-05 02:01:24 +01:00
iceman1001
f0cf62cd73
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
2015-01-04 23:43:07 +01:00
iceman1001
8d0a3e87d7
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
2015-01-04 22:49:54 +01:00
Martin Holst Swende
39d3ce5dd6
Moved iclass crc to be based on a lookup table
2015-01-04 22:10:25 +01:00
Martin Holst Swende
337818f7ab
Minor dox
2015-01-04 21:26:10 +01:00
Martin Holst Swende
4c3de57ad2
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
2015-01-04 21:22:54 +01:00
Martin Holst Swende
c8dd9b092e
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
2015-01-04 14:53:26 +01:00
Martin Holst Swende
2e9d4b3ff4
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
2015-01-03 15:11:48 +01:00
Martin Holst Swende
d0d1e24590
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
2015-01-03 14:36:38 +01:00
Martin Holst Swende
3400a4358d
Fixed indentation
2015-01-03 14:29:22 +01:00
Martin Holst Swende
854b9a233f
Removed unused variable
2015-01-03 14:29:07 +01:00
Martin Holst Swende
ae8e8a4372
Corrected indentation to tabs only
2015-01-03 14:21:07 +01:00
Martin Holst Swende
6ca4c6463e
Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops
2015-01-03 14:17:59 +01:00
iceman1001
b1329a0264
chg: updated the README.txt
...
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.
2015-01-02 00:09:59 +01:00
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
Martin Holst Swende
45dda9fcd7
Merge pull request #34 from marshmellow42/master
...
Fsk demod fixes and additions to client for offline demoding
2015-01-01 13:46:48 +01:00
marshmellow42
7eefddcc58
Revert "problems creating pull request with the new traces"
...
This reverts commit e33b652c53
.
2014-12-31 15:24:37 -05:00
marshmellow42
e33b652c53
problems creating pull request with the new traces
...
will add these traces later
2014-12-31 15:16:02 -05:00
marshmellow42
ac914e56db
minor adjustment to askmandemod for lf search
...
returns false if it finds data but not an EM410x format.
2014-12-31 14:55:58 -05:00
marshmellow42
9ec1416ad2
added data rtrim command
...
enter location to trim all samples after
2014-12-31 14:43:49 -05: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
marshmellow42
f822a063b3
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)
2014-12-31 02:27:30 -05:00
marshmellow42
d5a72d2fee
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.
2014-12-30 16:08:33 -05:00
marshmellow42
6bfa18eab4
Merge pull request #1 from Proxmark/master
...
Test
2014-12-29 16:14:23 -05:00
marshmellow42
2df8c07907
minor setting adjustments/cleanup
...
clean up code
2014-12-29 15:58:59 -05:00
marshmellow42
66707a3b3c
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
2014-12-29 15:32:53 -05:00
marshmellow42
7db5f1ca25
slight adjustment to include
...
removed extra unneeded path
2014-12-28 21:29:33 -05:00
marshmellow42
eb191de615
LF Demod streamlining
...
one shared location for demoding lf for arm and client. also added a
few raw demod commands.
2014-12-28 20:33:32 -05: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
marshmellow42
9e6dd4eb69
rename askrawdemod to askmandemod
2014-12-24 13:01:09 -05:00
marshmellow42
0e74c023bd
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
2014-12-24 11:48:41 -05:00
marshmellow42
cd48c19c31
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.
2014-12-23 15:16:53 -05:00
marshmellow42
2fc2150ea8
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.
2014-12-23 12:00:13 -05:00
pwpiwi
4be9e7507b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-23 11:44:41 +01:00
pwpiwi
a088364e9c
Merge branch 'master' of https://github.com/pwpiwi/proxmark3
2014-12-23 11:26:10 +01:00
pwpiwi
52bfb95543
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.
2014-12-23 11:21:42 +01:00
pwpiwi
7705bf4e37
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
2014-12-23 11:11:52 +01:00