RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-26 02:06:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
1111 commits 3 branches 14 tags 86 MiB
Commit graph

618 commits

Author SHA1 Message Date
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
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
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
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 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
marshmellow42 ea7d657f75 minor fix - got too comment happy removing test code 
should not have commented this code out
 2014-12-22 22:50:13 -05:00
marshmellow42 e888ed8e62 added new data askrawdemod command 
added new data askrawdemod command returned data fskdemod and separated
out new fskrawdemod commands
 2014-12-22 17:46:28 -05:00
iceman1001 3bc3598e88 added the changes from PM3 master. 
added some code for the AWID26
 2014-12-22 15:14:05 +01:00
pwpiwi 545f203826 adapted hf iclass list to new trace format 2014-12-20 21:32:44 +01:00
marshmellow42 ae2f73c12d put ask demod and mandemod 
put ask demod and mandemod back until i have time to test it
 2014-12-19 12:39:41 -05:00
marshmellow42 b3b706693b Final touches on IO prox and HID prox demod 
makes both more robust and handles various error situations.
 2014-12-19 12:14:27 -05: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
pwpiwi db4de4d82f Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-12-18 19:42:49 +01:00
pwpiwi 57642f63fa bugfixes hf epa cnonces 
- extended length (more than 1 byte) not handled correctly
- nonces not printed on Windows due to type mismatch
 2014-12-18 19:40:35 +01:00
pwpiwi f10bf20c6c Format hf 14a list output for bigger frame sizes 2014-12-18 19:39:16 +01:00
Martin Holst Swende 8e9768399c minor change 2014-12-18 14:46:38 +01:00
Martin Holst Swende 0eea34a2a3 Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data 2014-12-18 14:41:17 +01:00
Martin Holst Swende 7496d8d822 Merge pull request #32 from marshmellow42/master 
Fixes and additions to lf io fskdemod  and addon parameter to lf hid fskdemod
 2014-12-18 08:56:26 +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
pwpiwi 2bdd68c370 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()
 2014-12-17 20:57:26 +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
marshmellow42 083ca3de73 LF HID & IO prox fixes/options 2014-12-17 09:51:40 -05:00
pwpiwi 471c514167 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-12-16 07:47:02 +01:00
pwpiwi 6a1f2d82bb 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)
 2014-12-16 07:41:07 +01:00
Martin Holst Swende 6116c79618 Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0 2014-12-14 21:37:56 +01:00
Martin Holst Swende b160432340 Merge branch 'master' of github.com:Proxmark/proxmark3 2014-12-14 18:07:38 +01:00
Martin Holst Swende eabba3df7e Fix (iclass) 2014-12-14 18:07:12 +01:00
András Veres-Szentkirályi 0ff9a93966 Typofix: occurrences 
It's spelled with two rs.
 2014-12-10 16:42:31 +01:00
Martin Holst Swende d6a120a25b Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060 2014-11-30 22:30:36 +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
Martin Holst Swende ca4714cd23 More coverity fixes 2014-10-30 21:49:18 +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
iceman1001 3649b640e6 CHG: added possiblity to send <UID> into the "HF 15 SIM" 2014-10-30 14:11:37 +01:00
iceman1001 a61b4976bd FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks. 2014-10-30 00:09:01 +01:00
Martin Holst Swende 97d582a692 More coverity findings 2014-10-27 22:33:37 +01:00
Martin Holst Swende 90e278d3da Fixed several issues found using a coverity-scan 2014-10-27 21:46:04 +01:00
iceman1001 7c756d6892 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!
 2014-10-27 21:42:41 +01:00
iceman1001 2ae8a312e0 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..
 2014-10-27 19:46:21 +01:00
iceman1001 1010aacca0 Minor corrections in fskdemod i lfops.c , see Holimans branch. 
BUG: fixed a variablename, that didn't get changed.
 2014-10-27 09:56:18 +01:00
iceman1001 c6be64da09 Some more nasty bugs fixed in the lf t55xx manchester_decode method. 
ADD: a little function to see if GraphBuffer is not used.
 2014-10-26 23:16:25 +01:00
iceman1001 db297e69e1 BUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth 2014-10-26 21:30:29 +01:00
iceman1001 149aeadaa6 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.
 2014-10-26 21:25:06 +01:00
Martin Holst Swende f97d4e2378 First try att merging with head 2014-10-24 20:46:02 +02:00
iceman1001 081151eabb FIX: data mandemod read the wrong part of BigBuffer (no correct offset) 2014-10-24 15:34:50 +02:00
iceman1001 c2d25819d8 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
 2014-10-24 00:04:56 +02:00
iceman1001 72e930ef32 FIXED: lf t55xx fsk now demods but only to binary. 
ADD:  holimans lf io / hid fskdemod  changes.
 2014-10-23 18:36:44 +02:00
iceman1001 fbceacc5b8 add: "lf t55xx info" option to use data from Graphbuffer. 
add:  "lf t55xx trace"  option to use data from Graphbuffer.
 2014-10-16 22:25:38 +02:00
iceman1001 7bd30f12ac 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"..
 2014-10-16 15:05:27 +02:00
iceman1001 7737657747 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. 2014-10-07 21:34:02 +02:00
iceman1001 f6c18637ca chg: LF t55xx trace 
new:  LF t55xx info
 2014-10-06 19:42:50 +02:00
iceman1001 75465377b9 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
 2014-09-19 10:50:34 +02:00
Martin Holst Swende e6ee6c4cd1 Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research 2014-09-19 09:45:38 +02:00
iceman1001 3d93d4f940 Add: simple Application enum. 
Fix:  Minor overflows found by Holiman.
 2014-09-18 14:15:48 +02:00
iceman1001 313ee67ea2 Fixed: "hf mfdes info" 2014-09-18 12:38:31 +02:00
iceman1001 b44e523300 LF t55xx and LF em4x commands now should manchester decode data. However t55xx can have other settings and different encodings. 2014-09-16 13:56:06 +02:00
iceman1001 35147d51e3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-09-14 17:36:00 +02:00
pwpiwi c626c56ef5 hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition 2014-09-12 07:45:04 +02:00
iceman1001 76c7e6c363 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmdhfmf.c
 2014-09-11 23:29:14 +02:00
iceman1001 f38a152863 First check in. 2014-09-11 23:23:46 +02:00
iceman1001 4a79e52c0b Added piwis patch, 
first version of finding out the card size. Experimental.
 2014-09-11 22:33:43 +02:00
pwpiwi 79db03ef63 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
 2014-09-11 20:58:34 +02:00
pwpiwi baeaf57950 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
 2014-09-10 19:04:50 +02:00
Martin Holst Swende fdefed663f Some more lua-scripts and library fixes from iceman, including more default keys 2014-08-29 09:11:36 +02:00
Martin Holst Swende 5b1311fba2 Various scripts from iceman 2014-08-29 09:09:23 +02:00
pwpiwi b03c0f2d86 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
 2014-07-30 21:23:02 +02:00
pwpiwi 991f13f27d 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)
 2014-07-15 08:39:56 +02:00
pwpiwi 9a573554e0 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.
 2014-07-15 08:35:27 +02:00
pwpiwi 1604d0a290 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-07-01 07:09:21 +02:00
Martin Holst Swende 9e28ee9f14 Only documentation and minor changes 2014-06-30 11:23:14 +02:00
pwpiwi 19d6d91fd5 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.
 2014-06-30 08:21:50 +02:00
Martin Holst Swende 9b82de75f4 more work towards iclass elite dumping.. not quite finished yet though :( 2014-06-30 00:20:40 +02:00
Martin Holst Swende aa41c6058a Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo 2014-06-29 23:34:24 +02:00
Midnitesnake 74a3880283 Changes inorder for iclass dump to work correctly 2014-06-29 09:25:31 +01:00
Martin Holst Swende 26c0d833ac Some minor changes [iclass-related] 2014-06-28 22:57:48 +02:00
Martin Holst Swende 3ad48540d4 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
 2014-06-28 20:52:37 +02:00
Martin Holst Swende 42f57e0294 Merged with master 2014-06-27 13:16:31 +02:00
Martin Holst Swende 77abe781af fix for better csns 2014-06-27 12:52:28 +02:00
pwpiwi 72b1090acf 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
 2014-06-26 07:57:49 +02:00
iZsh b014c96d68 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.
 2014-06-21 21:33:54 +02:00
iZsh 7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
penturalabs fecd8202a5 implemented 'hf iclass dump xxxx', 
all you need is the magic key to dump contents of an iclass card
 2014-06-17 10:55:37 +01:00
Martin Holst Swende 9f6e9d1575 More work on iclass simulation attack 2014-06-16 21:27:12 +02:00
Martin Holst Swende d51b2eda8f Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577 2014-06-11 08:42:37 +02:00
penturalabs fe53c0311c improved calc_iclass_mac to work independant of size 2014-05-02 23:30:03 +01:00
Andrew Davies a66fca86b9 Updated proxmark research with Holiman's loclass framework 2014-05-02 11:11:54 +01:00
Martin Holst Swende f83cc12613 More work on iclass 2014-04-24 15:48:00 +02:00
Martin Holst Swende 17cba2693d 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 2014-04-24 14:13:33 +02:00
penturalabs c3963755b7 Implement replay command. 2014-04-15 11:47:01 +01:00
Martin Holst Swende 07976a256d Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch 2014-03-31 17:57:14 +02:00
Philippe Teuwen 19e2a10de5 Markdown help: use fixed column width 2014-03-27 16:49:37 +01:00
Philippe Teuwen 46782176fc Restore original inline help behavior as we've now separate fcts for -h/-m 2014-03-26 23:51:22 +01:00
Philippe Teuwen dec8e8bd9f Provide option -m for markdown help dump, -h for text dump 2014-03-26 23:50:34 +01:00
Philippe Teuwen 6f5dd6010e Fix description in help dump 2014-03-26 22:44:25 +01:00
Philippe Teuwen b5727175c0 Fix offline column in help dump 2014-03-26 22:40:41 +01:00
Martin Holst Swende 57c695563f Fixes to implement generation of markdown auto-generated documentation 2014-03-26 22:39:37 +01:00
Philippe Teuwen ae7aa73dd5 Add option -h to dump complete set of supported commands 
Usage: ./proxmark3 -h
Display both offline & online commands, online commands are flagged.

git-svn-id: https://proxmark3.googlecode.com/svn/trunk@850 ef4ab9da-24cd-11de-8aaa-f3a34680c41f
 2014-03-26 22:33:11 +01:00
holiman f5a1a9ce47 Merge pull request #8 from pwpiwi/master 
add .gitignore and merge svn r852
 2014-03-25 21:49:05 +01:00
pwpiwi d714d3effc Improvements/Fixes to 14443 sniffing/snooping 
- fixed a circular buffer rollover bug in iso14443a.c
- fixed 7 Byte UID handling in hf mf sniff
- fixed "cannot append" error in hf mf sniff d
- fixed hint on mfkey32 in hf mf sim x
- fixed hf mf sniff sometimes showing rogue data from previous calloc
- improve snooping/sniffing by syncing modulation detector window with reader signal (hi_iso14443a.v)
- code cleanup of hi_iso14443a.v
 2014-03-25 21:38:24 +01:00
W8M2Hg9lLmWqXSGC 88c637e6cd Merge pull request #7 from PenturaLabs/master 
Re-submitting Midnitesnake's Mifare Ultralight Patch
 2014-03-25 07:07:48 +11:00
W8M2Hg9lLmWqXSGC 347dea669a Merge pull request #5 from PenturaLabs/master 
Kantech ioProx Support - Fix
 2014-03-21 20:35:14 +11:00
PenturaLabs 94faa59465 Update cmdlfio.h 2014-03-21 07:51:51 +00:00
penturalabs c86220246e Sorry, included missing files from last pull request 2014-03-21 07:45:18 +00:00
W8M2Hg9lLmWqXSGC cf608ac8f3 Merge pull request #2 from PenturaLabs/master 
Added Kantech ioProx Support
 2014-03-19 08:47:28 +11:00
penturalabs a1f3bb120f Added Kantech ioProx Support 2014-03-18 20:52:48 +00:00
PenturaLabs 1801456ede Re-submitting Midnitesnake's Mifare Ultralight Patch 2014-03-18 14:02:32 +00:00
midnitesnake cb967ea976 Added Unique Code to EM41x 2014-03-18 07:42:54 +00:00
midnitesnake 080ff30a9e Added Unique Code to EM41x 2014-03-18 07:41:02 +00:00
martin.holst@gmail.com 0c12504a5a Patch submitted by 'FireFart', for some issues with 'hf mf chk'. See http://www.proxmark.org/forum/viewtopic.php?id=1888 for more info 2014-02-27 18:10:12 +00:00
micki.held@gmx.de 7bc95e2e43 - fixed iso1443a ManchesterDecoder in order to fix broken Snoop/Sniff 
- enhanced tracing: hf 14a list now shows meaningful timing information. With new option f it also shows the frame delay times (fdt)
- small fix for hf 14b list - it used to run into the trace trailer
- hf 14a sim now obeys iso14443 timing (fdt of 1172 or 1234 resp.)
Note: you need to flash FPGA as well.
More details in http://www.proxmark.org/forum/viewtopic.php?pid=9721#p9721
 2014-02-19 20:35:04 +00:00
martin.holst@gmail.com d2f487af9c Various improvements on the Mifare1kSimulation. Fixed issue with tracebuffer not being cleared, fixed issue with 'static' errors, added modes for doing reader-only attack, added interactive mode, added possibility to set UID from cmdline, either 7-byte or 4-byte. See http://www.proxmark.org/forum/viewtopic.php?id=1529 and http://www.proxmark.org/forum/viewtopic.php?id=1649&p=3 for some more background and discussion 2014-01-31 21:17:34 +00:00
micki.held@gmx.de e691fc45bc - improved reader sensitivity for 14443a cards (FPGA change!) 
- implemented ISO 14443A anticollision loop
See http://www.proxmark.org/forum/viewtopic.php?id=1797 further details
 2013-11-19 18:52:40 +00:00
martin.holst@gmail.com 6cacefa48d Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html 2013-11-07 11:33:48 +00:00
martin.holst@gmail.com 4c367827b5 Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html 2013-11-07 11:32:13 +00:00
martin.holst@gmail.com 77cd612f15 Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation 2013-11-06 18:34:10 +00:00
martin.holst@gmail.com da9d456e9f Minor fix, sometimes when data is sent without the pm3 is connected, it causes a spin-loop condition to occur which blocks the processor. fixed 2013-11-06 18:32:11 +00:00
martin.holst@gmail.com b11542a7f6 Minor fix in html skeleton 2013-10-31 18:24:03 +00:00
martin.holst@gmail.com e26df8425a Some more tinkering with a generic 13.56MHz reader, still not finished 2013-10-31 10:35:03 +00:00
martin.holst@gmail.com 5198f2e23c First steps towards creating a generic HF reader/identifier. A coop with Asper. 2013-10-30 21:10:47 +00:00
martin.holst@gmail.com 62a95012e9 Changed html template, in order to make it more generic and be usable on other types of data than mifare, now supports different highlighters. Implemented are NDEF and Mifare 2013-10-30 18:21:42 +00:00
dn337t@gmail.com a00411152f use CLOCKS_PER_SEC instead of platform-specific hardcoded value 2013-10-22 12:14:32 +00:00
martin.holst@gmail.com 412afdb87b Fixed linebreak error 2013-10-20 19:05:52 +00:00
martin.holst@gmail.com b3123cf603 Added functionality to dump data into .eml-file 2013-10-20 18:51:21 +00:00
martin.holst@gmail.com db132ea0e8 Script to convert emulator file (ASCII dump of data) into HTML 2013-10-20 18:48:04 +00:00
martin.holst@gmail.com c44241fdea Fixed minor errors 2013-10-20 18:47:15 +00:00
izsh@fail0verflow.com 06b82e6a6d cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf 14b raw -c -p') 2013-10-20 11:46:51 +00:00
izsh@fail0verflow.com 3f7c993d78 fix compilation issues with gcc 4.6: anonymous unions are not c99 2013-10-20 11:40:00 +00:00
martin.holst@gmail.com 6742c089b1 Changes to how dumping is performed, now utilises a library. This is in preparation for a more generic dumping of different types of cards. Also added functionality to html-dump .eml-files 2013-10-19 20:18:50 +00:00
martin.holst@gmail.com ba33066cef Minor change 2013-10-18 11:35:06 +00:00
martin.holst@gmail.com 1686e4d1db Added script to dump ndef-compliant tags. Written in collaboration with @asper 2013-10-18 11:14:23 +00:00
martin.holst@gmail.com 3c9ed0e180 Put manufacturer country within brackets 2013-10-18 07:36:20 +00:00
martin.holst@gmail.com 65e344df3e Some refactoring, also placed wait14443a here 2013-10-17 19:21:04 +00:00
martin.holst@gmail.com 5eab31c336 Manufacturer-info, to be used in upcoming script 2013-10-17 19:20:10 +00:00
martin.holst@gmail.com 57d384004d Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576 2013-10-17 18:28:21 +00:00
roel@libnfc.org 981bd4292e integrated MIFARE ultralight features, contributed by 'midnitesnake' 2013-10-11 08:43:23 +00:00
roel@libnfc.org 05f23c593c with the declaration of 'uint8_t destination[8]', 'destination' is already a pointer, don't try to get the address of it by using '&destination', then you will get a pointer to a pointer. 2013-10-11 08:37:08 +00:00
martin.holst@gmail.com 51defdd4a2 Fixed issue where the 'nested'-part of autopwn only used 16 sectors, not bothering with the rest 2013-10-09 19:37:55 +00:00
martin.holst@gmail.com b969713989 Fixed error with mifare_autopwn where keys were reversed, see http://www.proxmark.org/forum/viewtopic.php?pid=8494#p8494 2013-10-09 19:08:17 +00:00
roel@libnfc.org b1231445c7 removed unused compiler directives, cleaned up some code 2013-10-09 09:59:14 +00:00
martin.holst@gmail.com 0dae56d81e Committed mifare_autopwn.lua. For more infromation, see http://martin.swende.se/blog/Proxmark_Scripting_1.html and http://martin.swende.se/blog/Proxmark_Scripting_2.html 2013-10-08 18:50:54 +00:00
martin.holst@gmail.com ed77aabe00 Patch from 'buzzy' to add automatic flushing of output, see http://www.proxmark.org/forum/viewtopic.php?id=1740 for more details. 2013-10-08 18:30:01 +00:00
martin.holst@gmail.com 2dcdf1a683 Added nonce2key-API to lua 2013-10-07 10:11:15 +00:00
martin.holst@gmail.com 7d2313912c Fixed what may have been one cause of seg-faults in nonce2key... not sure, it still happens at times 2013-10-07 10:10:34 +00:00
martin.holst@gmail.com e481bc3299 Removed double print-out 2013-10-07 10:02:25 +00:00
fnargwibble@gmail.com e654346b79 i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh. 2013-10-05 16:55:53 +00:00
fnargwibble@gmail.com e12b82d362 show device name during flashing and change advice on hanging 2013-10-05 16:44:48 +00:00
martin.holst@gmail.com 0a85b72549 Reworked how to call 'standard' stuff from within lua scripts, so now it's much simpler both in lines of code and usage. A script can now call core.console('hf mf nested 1 0 a ffffffffffff') in order to execute anything via the old command line parser 2013-10-04 19:29:46 +00:00
jonor@live.it 4f269f63da Added more informations at command hw version. Now we can get some informations of microcontroller. 
Maybe is useful when someone got a bigger AT91

Example:
#db# Prox/RFID mark3 RFID instrument                 
#db# bootrom: svn 756-unclean 2013-09-14 15:04:07                 
#db# os: svn 796-unclean 2013-10-04 18:50:44                 
#db# FPGA image built on 2013/ 9/26 at  9:17:32                 
uC: AT91SAM7S256 Rev B          
Embedded Processor: ARM7TDMI          
Nonvolatile Program Memory Size: 256K bytes          
Second Nonvolatile Program Memory Size: None          
Internal SRAM Size: 64K bytes          
Architecture Identifier: AT91SAM7Sxx Series          
Nonvolatile Program Memory Type: Embedded Flash Memory
 2013-10-04 18:54:10 +00:00
martin.holst@gmail.com 6a2c1d8e14 Minor issue, usability 2013-10-04 18:47:38 +00:00
roel@libnfc.org 78e7cf984c fixed some more compiler warnings 2013-10-03 14:52:21 +00:00
roel@libnfc.org f66021cf48 fixed compiler warnings 2013-10-03 14:36:42 +00:00
martin.holst@gmail.com 2fca3ad92d Some documentation improvement 2013-10-03 13:58:14 +00:00
martin.holst@gmail.com c9e2f7807e Added a utility script to convert a 'dumpdata.bin'-file into the 'eml'-format that the emulator uses. Did not find any built-in way to do this, perhaps such functionality already exists.. ? 2013-10-03 13:56:11 +00:00
martin.holst@gmail.com acfdf9528b Fixed error in htmldumper 2013-10-03 13:26:17 +00:00
martin.holst@gmail.com 61caacda2b Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone .. part 2 2013-10-03 12:34:28 +00:00
martin.holst@gmail.com d78792f515 Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone 2013-10-03 12:33:58 +00:00
martin.holst@gmail.com 05ed5c496a Made script-based default key check a bit more intelligent, so it works not only on 4k cards. Also added option to save data to a dump-file 2013-10-01 19:58:42 +00:00
douniwan5788@gmail.com b19bd5d689 Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK. 
Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.
 2013-09-29 11:44:07 +00:00
martin.holst@gmail.com 686f0a1794 Moved script libraries into lualibs/folder, and added a patch to include the folder in the LUA_PATH (a.k.a package.path). See http://proxmark.org/forum/viewtopic.php?id=1750 for more details 2013-09-28 20:07:28 +00:00
martin.holst@gmail.com 5f6d6c9003 Raw 14a in commandline, patch by jonor, see http://proxmark.org/forum/viewtopic.php?id=1751 for more info 2013-09-28 19:28:55 +00:00
henryk@ploetzli.ch bf7163bdb3 * Add an option to lf read command to use an arbitrary divisor, enabling reading at frequencies other than 125 and 134 kHz. 2013-09-27 13:48:20 +00:00
roel@libnfc.org 7bb9d33e2c fixed warnings on Mac OS 10.8, xcode 5 2013-09-25 10:40:16 +00:00
martin.holst@gmail.com 450d2e3a96 Minor changes, usage examples and selftests 2013-09-21 20:46:32 +00:00