RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-25 01:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
10619 commits 3 branches 14 tags 85 MiB
Commit graph

10619 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Blaine Forbort 082789c4df Using defined command code 2014-12-22 00:21:20 -08:00
Blaine Forbort 46e14b0f96 Minor formatting change 2014-12-21 23:54:29 -08:00
Blaine Forbort f56bd0174a Remove unrelated file 2014-12-21 23:41:15 -08:00
Blaine Forbort 4e2e4bcf9b Tested by changing the master key from the default to a custom value 2014-12-21 22:59:24 -08:00
Blaine Forbort 0673263230 code to check RndA' from PICC was unreachable 2014-12-20 19:25:31 -08:00
Blaine Forbort 6a1aa12df0 Called the OnSuccess() method for whatever reason that's there. 2014-12-20 19:15:48 -08:00
Blaine Forbort 3c05723ee2 Limit to single-DES operation and return session key to client. 2014-12-20 17:18:26 -08:00
pwpiwi e688629475 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
 2014-12-20 21:56:12 +01:00
pwpiwi 545f203826 adapted hf iclass list to new trace format 2014-12-20 21:32:44 +01:00
Blaine Forbort 085b0e2ea9 Create session key 2014-12-20 00:10:59 -08:00
Blaine Forbort 6534821365 Accept key number from command line 2014-12-19 21:37:06 -08:00
Blaine Forbort a07a448220 Removed unneeded verbosity and checked for a 0x00 response from PICC after challenge response 2014-12-19 20:38:25 -08:00
Blaine Forbort 1051dee04a Challenge is now sent to PICC 2014-12-19 19:44:32 -08:00
Blaine Forbort 0127902ee6 Calculates response to PICC challenge 2014-12-19 19:36:19 -08:00
Blaine Forbort b6f41bfdfe Successfully decrypted RandB from PICC challenge 2014-12-19 12:15:45 -08:00
Blaine Forbort de9b66bc36 Added file demonstrating a singleDES AUTH operation using 'hf 14a raw' command 2014-12-19 12:15:04 -08:00
Blaine Forbort b216af9a24 Fixed build environment 2014-12-19 12:13:18 -08: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
marshmellow42 4860172789 LF HID & IO prox demod translation addons 
lf hid fskdemod - add bit format length, facility code and card numbers
for different formats
 2014-12-13 20:23:59 -05:00
ikarus f4bad97d92 Merge pull request #31 from dnet/patch-1 
Typofix: occurrences
 2014-12-10 19:10: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