]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agoApplied Holiman's fixes for iclass.c and CSNs
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.

9 years agoADD: Enio's intuative function for the command: "hw tune", where you plot the tunin...
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"

9 years agoBUG: don't try to fix things that ain't broken.. or not. My try for a fix ended...
iceman1001 [Thu, 27 Nov 2014 21:16:17 +0000 (22:16 +0100)]
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.

9 years agoADD: the option to simulate tnp3xxx inthe command "hf mf sim"
iceman1001 [Wed, 26 Nov 2014 12:52:39 +0000 (13:52 +0100)]
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.

9 years agoFIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to...
iceman1001 [Sun, 16 Nov 2014 10:22:06 +0000 (11:22 +0100)]
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

9 years agoFIX: rewrote the help text, cleaned up the code
iceman1001 [Fri, 14 Nov 2014 12:32:11 +0000 (13:32 +0100)]
FIX: rewrote the help text,  cleaned up the code

9 years agoREN: renamed tnp3.lua to tnp3dump.lua since that name is more explainatory
iceman1001 [Fri, 14 Nov 2014 12:24:45 +0000 (13:24 +0100)]
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.

9 years agoFIX: Minor correction of variablename. don't even ask.
iceman1001 [Thu, 13 Nov 2014 21:23:30 +0000 (22:23 +0100)]
FIX: Minor correction of variablename. don't even ask.

9 years agoFIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently...
iceman1001 [Thu, 13 Nov 2014 21:21:39 +0000 (22:21 +0100)]
FIX:  since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently changed "hf mf ekeyprn"

9 years agoFIX: The hf mf ekeyprn defaults to print all 40 sectorblocks of keys. (ie 4K card...
iceman1001 [Thu, 13 Nov 2014 21:13:46 +0000 (22:13 +0100)]
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.

9 years agoFIX: Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612...
iceman1001 [Thu, 13 Nov 2014 21:02:36 +0000 (22:02 +0100)]
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.

9 years agoCHG - some lua functions in utils.lua
iceman1001 [Thu, 13 Nov 2014 19:14:14 +0000 (20:14 +0100)]
CHG - some lua functions in utils.lua

9 years agoADD: tnp3.lua can now validate the checkums in the dump
iceman1001 [Wed, 12 Nov 2014 22:18:46 +0000 (23:18 +0100)]
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

9 years agoADD: html_dumplib.lua, added the functionality to save text-files.
iceman1001 [Mon, 10 Nov 2014 20:46:21 +0000 (21:46 +0100)]
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

9 years agoFIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearra...
iceman1001 [Sun, 9 Nov 2014 18:29:47 +0000 (19:29 +0100)]
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.

9 years agoUpdated tnp3.lua
iceman1001 [Sun, 9 Nov 2014 16:22:04 +0000 (17:22 +0100)]
Updated tnp3.lua
added some possibilities to abort the "hf mf nested" command
added a rudimentary items identification for tnp3xxx

9 years agoFIX: minor parseing bug when loading dumpkeys.bin file.
iceman1001 [Wed, 5 Nov 2014 18:16:54 +0000 (19:16 +0100)]
FIX:  minor parseing bug when loading dumpkeys.bin file.
ADD:  added some useful helperfunctions to utils.lua

9 years agoFIX: fixed the layout of data in tnp3.lua
iceman1001 [Mon, 3 Nov 2014 21:29:43 +0000 (22:29 +0100)]
FIX:  fixed the layout of data in tnp3.lua

9 years agoFIX: added some tnp3xxx identification i formatMifare.lua
iceman1001 [Mon, 3 Nov 2014 20:59:31 +0000 (21:59 +0100)]
FIX: added some tnp3xxx identification i formatMifare.lua
FIX: tnp3.lua is more or less finished. Needs testing.

9 years agofixing scripts/tnp3.lua
iceman1001 [Mon, 3 Nov 2014 14:25:54 +0000 (15:25 +0100)]
fixing  scripts/tnp3.lua

9 years agoADD: added identification for Mifare TNP3xxx tags.
iceman1001 [Mon, 3 Nov 2014 12:49:19 +0000 (13:49 +0100)]
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"

9 years agotest: hf 15 sim..
iceman1001 [Fri, 31 Oct 2014 08:26:35 +0000 (09:26 +0100)]
test:  hf 15 sim..

9 years agoADD: Implemented a "hf 14b write" function using the CmdHF14BCmdRaw method. The...
iceman1001 [Thu, 30 Oct 2014 14:28:45 +0000 (15:28 +0100)]
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

9 years agoFIX: maybe I should actually send the uid bytes with the command request....
iceman1001 [Thu, 30 Oct 2014 13:29:31 +0000 (14:29 +0100)]
FIX:  maybe I should actually send the uid bytes with the command request....

9 years agoCHG: added possiblity to send <UID> into the "HF 15 SIM"
iceman1001 [Thu, 30 Oct 2014 13:11:37 +0000 (14:11 +0100)]
CHG: added possiblity to send <UID> into the "HF 15 SIM"

9 years agoFIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks.
iceman1001 [Wed, 29 Oct 2014 23:09:01 +0000 (00:09 +0100)]
FIXED:   Merged all Holimans code-review issues which should fix a lot of memoryleaks.

9 years agoFIX: Another try to see if the "lf em4x 410xsim" becomes better, added the clock...
iceman1001 [Mon, 27 Oct 2014 20:42:41 +0000 (21:42 +0100)]
FIX:  Another try to see if the  "lf em4x 410xsim"  becomes better,  added the clock in the calls since the auto detection of the clock seems to be wrong. I get 67, instead of 64...

FIX:  changes the transfersize from sim -> pm3,  was 48, now USB_CMD_DATA_SIZE (512) Much faster!

9 years agoInital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that...
iceman1001 [Mon, 27 Oct 2014 18:46:21 +0000 (19:46 +0100)]
Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that the sim works.
Something about speed,  the clock detection is not so good.  should be 64,  usually 67..

9 years agoMinor corrections in fskdemod i lfops.c , see Holimans branch.
iceman1001 [Mon, 27 Oct 2014 08:56:18 +0000 (09:56 +0100)]
Minor corrections in fskdemod i lfops.c , see Holimans branch.
BUG: fixed a variablename, that didn't get changed.

9 years agoSome more nasty bugs fixed in the lf t55xx manchester_decode method.
iceman1001 [Sun, 26 Oct 2014 22:16:25 +0000 (23:16 +0100)]
Some more nasty bugs fixed in the lf t55xx manchester_decode method.
ADD: a little function to see if GraphBuffer is not used.

9 years agoBUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth
iceman1001 [Sun, 26 Oct 2014 20:30:29 +0000 (21:30 +0100)]
BUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth

9 years agoMinor bug fixes with help from Holiman.
iceman1001 [Sun, 26 Oct 2014 20:25:06 +0000 (21:25 +0100)]
Minor bug fixes with help from Holiman.
FIX: sprint_hex, sprint_bin  has better length detection.
FIX: ui.c has removed all c99 array declarations, with malloc
FIX: hfmfmfu.c wrong length in one array caused crashes in CmdHF14AMfURdCard
FIX: cmdlft55xx.c CmdDump has now a correct pwd string.

9 years agoFIX: data mandemod read the wrong part of BigBuffer (no correct offset)
iceman1001 [Fri, 24 Oct 2014 13:34:50 +0000 (15:34 +0200)]
FIX: data mandemod read the wrong part of BigBuffer (no correct offset)

9 years agoBUG: the lf read now uses "getbigbuffer" which the offset from where the data start...
iceman1001 [Thu, 23 Oct 2014 22:04:56 +0000 (00:04 +0200)]
BUG:  the lf read now uses "getbigbuffer"  which the offset from where the data starts in "data samples nnnnn" needed to be set.
ADD:  ioprox nxp identifikations

9 years agoFIXED: lf t55xx fsk now demods but only to binary.
iceman1001 [Thu, 23 Oct 2014 16:36:44 +0000 (18:36 +0200)]
FIXED:  lf t55xx fsk  now demods but only to binary.
ADD:  holimans lf io / hid fskdemod  changes.

9 years agoadd: "lf t55xx info" option to use data from Graphbuffer.
iceman1001 [Thu, 16 Oct 2014 20:25:38 +0000 (22:25 +0200)]
add:  "lf t55xx info"  option to use data from Graphbuffer.
add:  "lf t55xx trace"  option to use data from Graphbuffer.

9 years agoSmall fixes,
iceman1001 [Thu, 16 Oct 2014 13:05:27 +0000 (15:05 +0200)]
Small fixes,
Fix: removed a call to free,  which I think made linux people unhappy during "lf t55xx rd 0"...
Add: "lf t55xx fsk"  now kind of outputs binary from "FSK2a R/40 R/50"..

9 years agoFixed: the dampening field detection is enhanced. If half a frame (clock rate)...
iceman1001 [Tue, 7 Oct 2014 19:34:02 +0000 (21:34 +0200)]
Fixed:  the dampening field detection is enhanced.  If half a frame (clock rate) of values is within 40% of the mean value then it is a dampening field.

9 years agochg: LF t55xx trace
iceman1001 [Mon, 6 Oct 2014 17:42:50 +0000 (19:42 +0200)]
chg:  LF t55xx trace
new:  LF t55xx info

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Fri, 19 Sep 2014 08:50:34 +0000 (10:50 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/iclass.c
client/Makefile
client/cmdhficlass.c
client/loclass/cipher.c
client/loclass/fileutils.c
client/loclass/ikeys.h
include/usb_cmd.h

9 years agoMerge pull request #22 from Proxmark/PenturaLabs-iclass-research
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

9 years agoMerge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research 22/head
Martin Holst Swende [Fri, 19 Sep 2014 07:45:38 +0000 (09:45 +0200)]
Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research

9 years agoAdd: simple Application enum.
iceman1001 [Thu, 18 Sep 2014 12:15:48 +0000 (14:15 +0200)]
Add:  simple Application enum.
Fix:  Minor overflows found by Holiman.

9 years agoFixed: "hf mfdes info"
iceman1001 [Thu, 18 Sep 2014 10:38:31 +0000 (12:38 +0200)]
Fixed: "hf mfdes info"

9 years agoLF t55xx and LF em4x commands now should manchester decode data. However t55xx...
iceman1001 [Tue, 16 Sep 2014 11:56:06 +0000 (13:56 +0200)]
LF t55xx  and LF em4x  commands now should manchester decode data.  However t55xx can have other settings and different encodings.

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Sun, 14 Sep 2014 15:36:00 +0000 (17:36 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agohf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Thu, 11 Sep 2014 21:29:14 +0000 (23:29 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/cmdhfmf.c

9 years agoFirst check in.
iceman1001 [Thu, 11 Sep 2014 21:23:46 +0000 (23:23 +0200)]
First check in.

9 years agoAdded piwis patch,
iceman1001 [Thu, 11 Sep 2014 20:33:43 +0000 (22:33 +0200)]
Added piwis patch,
first version of finding out the card size. Experimental.

9 years agohf mf dump error handling, revive hf mf chk d option, provide known keys dictionary...
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

9 years agofix/add support for 4K (and other non 1K) card sizes in hf mf commands
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

9 years agoSome more lua-scripts and library fixes from iceman, including more default keys
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

9 years agoVarious scripts from iceman
Martin Holst Swende [Fri, 29 Aug 2014 07:09:23 +0000 (09:09 +0200)]
Various scripts from iceman

9 years agoadd *.eml to .gitignore
pwpiwi [Tue, 5 Aug 2014 16:45:37 +0000 (18:45 +0200)]
add *.eml to .gitignore

9 years agobugfix hf mf sim
pwpiwi [Tue, 5 Aug 2014 16:40:19 +0000 (18:40 +0200)]
bugfix hf mf sim
- an additional erronous byte was sent after SAK

9 years agobugfixes hf mf sim
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

9 years agominor bugfixes to hf mf sniff and hf 14a snoop
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)

9 years agominor bugfix and enhancement to hf 14a reader
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.

9 years agoBugfix hf 14a raw: v1.1.0
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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Tue, 1 Jul 2014 05:09:21 +0000 (07:09 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agoOnly documentation and minor changes
Martin Holst Swende [Mon, 30 Jun 2014 09:23:14 +0000 (11:23 +0200)]
Only documentation and minor changes

9 years agohf 14a reader enhancement
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.

9 years agomore work towards iclass elite dumping.. not quite finished yet though :(
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 :(

9 years agoMerged two iclass-reader functions into one to remove duplicated code, update loclass...
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

9 years agoMerge branch 'PenturaLabs-iclass-research' of github.com:Proxmark/proxmark3 into...
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

9 years agoMinor
Martin Holst Swende [Sun, 29 Jun 2014 11:48:13 +0000 (13:48 +0200)]
Minor

9 years agoChanges inorder for iclass dump to work correctly
Midnitesnake [Sun, 29 Jun 2014 08:25:31 +0000 (09:25 +0100)]
Changes inorder for iclass dump to work correctly

9 years agoSome minor changes [iclass-related]
Martin Holst Swende [Sat, 28 Jun 2014 20:57:48 +0000 (22:57 +0200)]
Some minor changes [iclass-related]

9 years agoMerge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into Pentu...
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

9 years agoMerge pull request #17 from Proxmark/iclass-fixes
Martin Holst Swende [Sat, 28 Jun 2014 10:50:09 +0000 (12:50 +0200)]
Merge pull request #17 from Proxmark/iclass-fixes

Iclass fixes

9 years agoMerge remote-tracking branch 'origin/master' into iclass-fixes 17/head
Martin Holst Swende [Sat, 28 Jun 2014 10:47:40 +0000 (12:47 +0200)]
Merge remote-tracking branch 'origin/master' into iclass-fixes

9 years agofpga/min_max_tracker.v: english
iZsh [Fri, 27 Jun 2014 21:28:56 +0000 (23:28 +0200)]
fpga/min_max_tracker.v: english

9 years agogit housekeeping:
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

9 years agoNew LF edge detection algorithm + lowpass filter
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

9 years agoMerged with master
Martin Holst Swende [Fri, 27 Jun 2014 11:16:31 +0000 (13:16 +0200)]
Merged with master

9 years agofix for better csns
Martin Holst Swende [Fri, 27 Jun 2014 10:52:28 +0000 (12:52 +0200)]
fix for better csns

9 years agoKeep the PM3 code repo clean of website/wiki stuff.
ikarus [Thu, 26 Jun 2014 08:50:23 +0000 (10:50 +0200)]
Keep the PM3 code repo clean of website/wiki stuff.

9 years agoBugfixes:
pwpiwi [Thu, 26 Jun 2014 05:57:49 +0000 (07:57 +0200)]
Bugfixes:
- Byteorder was wrong when displaying ATQA in hf 14a read
- 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids

9 years agonew command "lf snoop" to snoop raw ADC values
iZsh [Sat, 21 Jun 2014 19:33:54 +0000 (21:33 +0200)]
new command "lf snoop" to snoop raw ADC values

fpga/lo_read.v (lf_field): new argument.
fpga/fpga_lf.v: modify accordingly.

armsrc/apps.h (FPGA_MAJOR_MODE_LF_READER): Rename as FPGA_MAJOR_MODE_LF_ADC.
armsrc/apps.h (FPGA_LF_ADC_READER_FIELD): New LF option.
armsrc/lfops.c: Modify accordingly.

client/cmdlf.c (CmdLFSnoop): New command.
armsrc/appmain.c, armsrc/lfops.c, client/cmdlf.h, include/usb_cmd.h: Modify accordingly.

9 years agofpga/fpga_hf.v, fpga_lf.v, lo_edge_detect.v, lo_passthru.v, lo_read.v: copyright...
iZsh [Fri, 20 Jun 2014 10:38:58 +0000 (12:38 +0200)]
fpga/fpga_hf.v, fpga_lf.v, lo_edge_detect.v, lo_passthru.v, lo_read.v: copyright notice

9 years agoarmsrc/fpgaloader.c: forgot the copyright notice
iZsh [Fri, 20 Jun 2014 10:29:58 +0000 (12:29 +0200)]
armsrc/fpgaloader.c: forgot the copyright notice

9 years agoTHIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams...
iZsh [Thu, 19 Jun 2014 23:02:59 +0000 (01:02 +0200)]
THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand.

9 years agoimplemented 'hf iclass dump xxxx', 15/head
penturalabs [Tue, 17 Jun 2014 09:55:37 +0000 (10:55 +0100)]
implemented 'hf iclass dump xxxx',
all you need is the magic key to dump contents of an iclass card

9 years agoMore work on iclass simulation attack
Martin Holst Swende [Mon, 16 Jun 2014 19:27:12 +0000 (21:27 +0200)]
More work on iclass simulation attack

9 years agoAdded enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic...
Martin Holst Swende [Wed, 11 Jun 2014 06:42:37 +0000 (08:42 +0200)]
Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577

10 years agoMinor changes, it may actually work now, need to test with a credentialed reader
Martin Holst Swende [Sat, 7 Jun 2014 20:16:57 +0000 (22:16 +0200)]
Minor changes, it may actually work now, need to test with a credentialed reader

10 years agoMerged with head
Martin Holst Swende [Sat, 7 Jun 2014 20:04:27 +0000 (22:04 +0200)]
Merged with head

10 years agodebug in progress
Martin Holst Swende [Sat, 7 Jun 2014 20:00:31 +0000 (22:00 +0200)]
debug in progress

10 years agoMinor changes in iclass.c
Martin Holst Swende [Sat, 7 Jun 2014 19:49:56 +0000 (21:49 +0200)]
Minor changes in iclass.c

10 years agonew fpga image for better iso15693 simulation
Martin Holst Swende [Sat, 7 Jun 2014 19:44:45 +0000 (21:44 +0200)]
new fpga image for better iso15693 simulation

10 years agoAdded mode for 424k modulation (iso 15693)
Martin Holst Swende [Sat, 7 Jun 2014 19:40:47 +0000 (21:40 +0200)]
Added mode for 424k modulation (iso 15693)

10 years agoAdded 424KHz mode for iso 15693 simulation
Martin Holst Swende [Sat, 7 Jun 2014 19:39:52 +0000 (21:39 +0200)]
Added 424KHz mode for iso 15693 simulation

10 years agoimproved calc_iclass_mac to work independant of size
penturalabs [Fri, 2 May 2014 22:30:03 +0000 (23:30 +0100)]
improved calc_iclass_mac to work independant of size

10 years agoUpdated proxmark research with Holiman's loclass framework
Andrew Davies [Fri, 2 May 2014 10:11:54 +0000 (11:11 +0100)]
Updated proxmark research with Holiman's loclass framework

10 years agoFixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967, two bytes are discarde...
Martin Holst Swende [Sat, 26 Apr 2014 14:15:16 +0000 (16:15 +0200)]
Fixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967, two bytes are discarded when adding crc and sending raw iso14443a commands

10 years agoMore work on iclass
Martin Holst Swende [Thu, 24 Apr 2014 13:48:00 +0000 (15:48 +0200)]
More work on iclass

10 years agoImplemented client side changes for iclass hack, attempted to fix issues with trace...
Martin Holst Swende [Thu, 24 Apr 2014 12:13:33 +0000 (14:13 +0200)]
Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping

10 years agoExperimenting with hacking iclass
Martin Holst Swende [Thu, 17 Apr 2014 07:53:54 +0000 (09:53 +0200)]
Experimenting with hacking iclass

10 years agoImplement replay command.
penturalabs [Tue, 15 Apr 2014 10:47:01 +0000 (11:47 +0100)]
Implement replay command.

Impressum, Datenschutz