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
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
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 [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.
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
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
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
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.
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
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
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.
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
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()
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
Martin Holst Swende [Thu, 30 Oct 2014 20:49:18 +0000 (21:49 +0100)]
More coverity fixes
Martin Holst Swende [Thu, 30 Oct 2014 19:08:29 +0000 (20:08 +0100)]
Merge pull request #23 from holiman/master
LF operations fixes, and coverity code scan fixes
Martin Holst Swende [Tue, 28 Oct 2014 20:46:28 +0000 (21:46 +0100)]
Merge pull request #2 from holiman/coverity_fixes
Coverity fixes
Martin Holst Swende [Tue, 28 Oct 2014 20:44:17 +0000 (21:44 +0100)]
Coverity-fixes in armsrc
Martin Holst Swende [Mon, 27 Oct 2014 21:33:37 +0000 (22:33 +0100)]
More coverity findings
Martin Holst Swende [Mon, 27 Oct 2014 20:46:04 +0000 (21:46 +0100)]
Fixed several issues found using a coverity-scan
Martin Holst Swende [Mon, 27 Oct 2014 18:13:30 +0000 (19:13 +0100)]
Merge pull request #1 from holiman/ioprox_fixes
Ioprox fixes
Martin Holst Swende [Sat, 25 Oct 2014 20:42:27 +0000 (22:42 +0200)]
Some more docs, also made lf hid fskdemod a bit more stable. Should be no more false readings now
Martin Holst Swende [Fri, 24 Oct 2014 19:12:31 +0000 (21:12 +0200)]
Some minor changes and some documentation
Martin Holst Swende [Fri, 24 Oct 2014 18:53:43 +0000 (20:53 +0200)]
Fixed compilation issues, but functionality not tested
Martin Holst Swende [Fri, 24 Oct 2014 18:46:02 +0000 (20:46 +0200)]
First try att merging with head
Martin Holst Swende [Fri, 19 Sep 2014 07:50:56 +0000 (09:50 +0200)]
Merge pull request #22 from Proxmark/PenturaLabs-iclass-research
Pentura labs iclass research
Martin Holst Swende [Fri, 19 Sep 2014 07:45:38 +0000 (09:45 +0200)]
Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research
pwpiwi [Fri, 12 Sep 2014 05:45:04 +0000 (07:45 +0200)]
hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
pwpiwi [Thu, 11 Sep 2014 18:58:34 +0000 (20:58 +0200)]
hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file
- hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case.
- hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin).
if there are unknown keys, write 0xffffffffffff instead to the file.
- provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from
mf_default_keys.lua
pwpiwi [Wed, 10 Sep 2014 17:04:50 +0000 (19:04 +0200)]
fix/add support for 4K (and other non 1K) card sizes in hf mf commands
- hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A)
- hf mf restore (add): added (optional) card size parameter and support for non 1K cards
- hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf eget (fix): displayed three instead of one block
- hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility)
- hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
Martin Holst Swende [Fri, 29 Aug 2014 07:11:36 +0000 (09:11 +0200)]
Some more lua-scripts and library fixes from iceman, including more default keys
Martin Holst Swende [Fri, 29 Aug 2014 07:09:23 +0000 (09:09 +0200)]
Various scripts from iceman
pwpiwi [Tue, 5 Aug 2014 16:45:37 +0000 (18:45 +0200)]
add *.eml to .gitignore
pwpiwi [Tue, 5 Aug 2014 16:40:19 +0000 (18:40 +0200)]
bugfix hf mf sim
- an additional erronous byte was sent after SAK
pwpiwi [Wed, 30 Jul 2014 19:23:02 +0000 (21:23 +0200)]
bugfixes hf mf sim
- output of debug messages caused communication failures due to timing issues.
hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim
pwpiwi [Tue, 15 Jul 2014 06:39:56 +0000 (08:39 +0200)]
minor bugfixes to hf mf sniff and hf 14a snoop
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)
pwpiwi [Tue, 15 Jul 2014 06:35:27 +0000 (08:35 +0200)]
minor bugfix and enhancement to hf 14a reader
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.
pwpiwi [Tue, 1 Jul 2014 06:28:28 +0000 (08:28 +0200)]
Bugfix hf 14a raw:
number of bits sent was wrong when option -c was used without option -b
pwpiwi [Tue, 1 Jul 2014 05:09:21 +0000 (07:09 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Martin Holst Swende [Mon, 30 Jun 2014 09:23:14 +0000 (11:23 +0200)]
Only documentation and minor changes
pwpiwi [Mon, 30 Jun 2014 06:21:50 +0000 (08:21 +0200)]
hf 14a reader enhancement
In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.
Martin Holst Swende [Sun, 29 Jun 2014 22:20:40 +0000 (00:20 +0200)]
more work towards iclass elite dumping.. not quite finished yet though :(
Martin Holst Swende [Sun, 29 Jun 2014 21:34:24 +0000 (23:34 +0200)]
Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo
Martin Holst Swende [Sun, 29 Jun 2014 11:52:05 +0000 (13:52 +0200)]
Merge branch 'PenturaLabs-iclass-research' of github.com:Proxmark/proxmark3 into PenturaLabs-iclass-research
Martin Holst Swende [Sun, 29 Jun 2014 11:48:13 +0000 (13:48 +0200)]
Minor
Midnitesnake [Sun, 29 Jun 2014 08:25:31 +0000 (09:25 +0100)]
Changes inorder for iclass dump to work correctly
Martin Holst Swende [Sat, 28 Jun 2014 20:57:48 +0000 (22:57 +0200)]
Some minor changes [iclass-related]
Martin Holst Swende [Sat, 28 Jun 2014 18:52:37 +0000 (20:52 +0200)]
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research
Conflicts:
README.txt
armsrc/apps.h
client/Makefile
client/cmdhficlass.c
client/cmdhficlass.h
Martin Holst Swende [Sat, 28 Jun 2014 10:50:09 +0000 (12:50 +0200)]
Merge pull request #17 from Proxmark/iclass-fixes
Iclass fixes
Martin Holst Swende [Sat, 28 Jun 2014 10:47:40 +0000 (12:47 +0200)]
Merge remote-tracking branch 'origin/master' into iclass-fixes
iZsh [Fri, 27 Jun 2014 21:28:56 +0000 (23:28 +0200)]
fpga/min_max_tracker.v: english
pwpiwi [Fri, 27 Jun 2014 17:23:42 +0000 (19:23 +0200)]
git housekeeping:
- added *.log files to .gitignore
- new file .gitattributes: tell git not to diff or merge binary *.bit (FPGA) files
iZsh [Sat, 21 Jun 2014 22:26:38 +0000 (00:26 +0200)]
New LF edge detection algorithm + lowpass filter
This is a new LF edge detection algorithm for the FPGA.
- It uses a low-pass IIR filter to clean the signal
(see https://fail0verflow.com/blog/2014/proxmark3-fpga-iir-filter.html)
- The algorithm is able to detect consecutive peaks in the same
direction
- It uses an envelope follower to dynamically adjust the peak thresholds
- The main threshold used in the envelope follower can be set from the ARM side
fpga/lf_edge_detect.v,
fpga/lp20khz_1MSa_iir_filter.v,
fpga/min_max_tracker.v: New file.
fpga/lo_edge_detect.v, fpga/fpga_lf.v: Modify accordingly.
armsrc/apps.h (FPGA_CMD_SET_USER_BYTE1,
FPGA_CMD_SET_EDGE_DETECT_THRESHOLD): New FPGA command.
fpga/fpga_lf.v: Modify accordingly/Add a 8bit user register.
fpga/fpga_lf.bit: Update accordingly.
fpga/tests: New directory for testbenches
fpga/tests/Makefile: New file. It compiles the testbenches
and runs all the tests by default (comparing with the golden output)
fpga/tests/tb_lp20khz_1MSa_iir_filter.v,
fpga/tests/tb_min_max_tracker.v,
fpga/tests/tb_lf_edge_detect.v: New testbenches
fpga/tests/plot_edgedetect.py: New script to plot the results from
the edge detection tests.
fpga/tests/tb_data: New directory for data and golden outputs