Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 15:26:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
1173 commits 3 branches 11 tags 34 MiB
Commit graph

657 commits

Author SHA1 Message Date
marshmellow42 abab60ae21 MFU info adjustments 2015-05-06 09:27:03 -04:00
marshmellow42 75377d29d6 MFU - Icemans further improvements 
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
 2015-05-06 00:55:29 -04:00
marshmellow42 63e1d35a07 Merge remote-tracking branch 'upstream/master' 2015-05-03 23:31:58 -04:00
marshmellow42 f9848fd647 MFU dump UL-C with key 
adding UL-C auth and keys to dump cmd
swapped endian for input of hf mfu crdbl to match output of hf mfu info
cmd and tag info app
 2015-05-03 23:17:11 -04:00
Martin Holst Swende 4b36037948 Fixes to issue #100 2015-05-03 22:09:52 +02:00
marshmellow42 b3125340f3 Icemans UL-C Auth dev side fix plus a few other ... 
... small UL fixes
 2015-05-03 15:41:11 -04:00
marshmellow42 7eec1204e7 fix bug in mfu cauth 2015-04-30 10:34:20 -04:00
marshmellow42 92690507ab Iceman's updates to MFU info and dump 2015-04-30 09:28:43 -04:00
marshmellow42 f168b2633b MF Ultralight - Iceman's updates + mine 
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
 2015-04-29 18:27:31 -04:00
marshmellow42 bdfb62b405 Iceman's script aes fix #93 
Thanks Iceman (note I did not have a tag to double test this one. :)
 2015-04-28 15:53:07 -04:00
marshmellow42 4745afb647 Iceman's Issue #96 fix 2015-04-28 15:35:23 -04:00
Martin Holst Swende a3abb02897 Merge branch 'master' of github.com:Proxmark/proxmark3 2015-04-23 09:51:04 +02:00
Martin Holst Swende 0e6c7336b0 Fixed issue with dumping iclass tags > 2KB in size 2015-04-23 09:50:44 +02:00
marshmellow42 8e0cf02308 minor change to lf em4x menu & iceman script... 
...updates
 2015-04-10 00:06:59 -04:00
marshmellow42 664f658650 nexwatch fix .h file + icemans mf csetblk w arg 
forgot to include the new nexwatch command in the header...
added icemans hf mf csetblk w parameter fix
 2015-04-08 15:08:05 -04:00
marshmellow42 25d3e5cc83 Merge remote-tracking branch 'upstream/master' 2015-04-08 14:19:19 -04:00
marshmellow42 411105e036 added nexwatch demod & iceman lua 
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
 2015-04-08 14:19:03 -04:00
marshmellow42 322f7eb111 fix to lf t5 detect/read cmds 
i think this functions fairly well...
still some issues with demod positioning for various reasons.
ASK/Biph/FSK work pretty well
the PSK Demod still needs a little attention to help it better demod
various carriers...
 2015-04-08 11:18:29 -04:00
marshmellow42 9632ecbe3d update t5 detection test() 
missed this file in last commit... sorry.
 2015-04-08 10:12:24 -04:00
Martin Holst Swende 83602affe5 Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337 2015-04-08 13:31:04 +02:00
marshmellow42 fef74fdce4 lf ask consolidation 
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category

front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
 2015-04-08 01:07:39 -04:00
marshmellow42 49bbc60af3 lf cleaning++ 
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
 2015-04-07 00:53:06 -04:00
marshmellow42 cc15a1187b lf cleanup - fixes 
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
 2015-04-06 23:17:30 -04:00
marshmellow42 1f918317e2 add maxErr to data manrawdecode 2015-04-05 21:59:36 -04:00
marshmellow42 224ce36eb1 lf t5xx - icemans update 2015-04-05 16:37:41 -04:00
marshmellow42 2767fc0291 lf cleaning 
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
 2015-04-05 00:58:57 -04:00
marshmellow42 643fb10b2d Merge remote-tracking branch 'upstream/master' 2015-04-04 21:29:16 -04:00
marshmellow42 6e98444637 lfdemod reduce duplicate code 
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
 2015-04-02 23:55:12 -04:00
marshmellow42 23f0a7d862 lfem4x cleanup/add/fix 
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
 2015-04-02 12:48:52 -04:00
Martin Holst Swende 9795e535c9 Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf 2015-04-01 09:24:29 +02:00
Martin Holst Swende d5d6f22718 Merge pull request #91 from marshmellow42/master 
lfdemod.c refactoring  (+ bug fixes)
 2015-03-31 22:11:19 +02:00
marshmellow42 a4669d6ef3 small fix in t5 trace data 2015-03-31 11:30:16 -04:00
Martin Holst Swende caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found 2015-03-29 21:49:58 +02:00
marshmellow42 f8f894a50f rawdemod param cleanup 
plus lfdemod.h cleanup
 2015-03-27 23:47:31 -04:00
marshmellow42 2eec55c8a4 lfdemods streamline & bug fixes 
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod

cleaned up lfdemod.c some
 2015-03-27 00:02:30 -04:00
marshmellow42 e0165dcf3a Fixed indents to Tabs from Spaces 
Spacing changes ONLY - no code changes
 2015-03-25 14:24:36 -04:00
marshmellow42 c7d169ec02 clean up em410x output 2015-03-24 22:11:32 -04:00
marshmellow42 90677ad99b EM410x bug fix 2015-03-24 20:26:14 -04:00
marshmellow42 9680b11d9e remove debugging print calls 2015-03-23 20:25:54 -04:00
marshmellow42 1fbf895616 lf updates 
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar -  for biphase demods
improve detectclock a for strong antennas
 2015-03-23 16:29:50 -04:00
marshmellow42 13d77ef964 lf t5 read plus lf demod adjustments 
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
 2015-03-22 15:28:48 -04:00
marshmellow42 b41534d142 adjust ask/biphase handling - more complete 
also added XL EM410x formats
 2015-03-15 22:03:50 -04:00
marshmellow42 7a8a982bde adjust pskdemod 
add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods
 2015-03-13 20:49:34 -04:00
marshmellow42 e74fc2ecba give credit where credit is due 
thanks iceman for the crc :)
 2015-03-13 14:00:11 -04:00
marshmellow42 9f7bbd24c9 data autocorr additions 2015-03-13 12:23:26 -04:00
marshmellow42 5279085ae7 Merge remote-tracking branch 'upstream/master' 2015-03-13 11:20:00 -04:00
marshmellow42 d9d41e0f3f minor g-prox-ii demod fix 
lf search was occasionally outputting false results.
 2015-03-13 11:18:55 -04:00
marshmellow42 73d04bb417 data psk demod minor fixes, pyramid demod add CS 
also adjusted autocorrelate and added a printout for lf search u
 2015-03-13 11:09:12 -04:00
pwpiwi 9185099ed8 Merge pull request #75 from pwpiwi/qtmakefile 
(issue #47) use Qt5 includes and libraries, if present
 2015-03-13 07:24:56 +01:00
pwpiwi 04bc1c660b fix: hf 14a raw was broken 
(see http://www.proxmark.org/forum/viewtopic.php?id=2351)
 2015-03-11 20:19:30 +01:00
pwpiwi 8c04722db6 (issue #47) use Qt5 includes and libraries, if present 2015-03-10 19:00:39 +01:00
Martin Holst Swende 58e93ff593 Merge pull request #74 from marshmellow42/master 
new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod
 2015-03-10 00:25:51 +01:00
marshmellow42 1302428367 finish data printdemodbuffer command 2015-03-09 16:56:00 -04:00
pwpiwi 16a95d76ac fix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation. 2015-03-09 21:36:27 +01:00
marshmellow42 5658e82e1e sim buffer max settings tests 2015-03-09 15:58:06 -04:00
marshmellow42 ada339a10f biphase bug fixes 2015-03-09 15:27:20 -04:00
marshmellow42 d66d484347 fixed rawdemod help options 2015-03-08 18:07:01 -04:00
marshmellow42 712ebfa6df 1 bug fix + code trimming 2015-03-07 23:31:23 -05:00
marshmellow42 df51693f95 Merge remote-tracking branch 'upstream/master' 2015-03-06 12:30:16 -05:00
marshmellow42 78f5b1a77c lf sim fixes/creations correct now 
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim  (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
 2015-03-06 12:28:54 -05:00
marshmellow42 e09f21fa7b Revert "lf sim fixes/creations" 
This reverts commit 293de1bad7.
 2015-03-06 12:26:33 -05:00
marshmellow42 293de1bad7 lf sim fixes/creations 
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim  (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
 2015-03-06 12:25:36 -05:00
ikarus 9cefee6f42 Fixed issue #36 & improved file consistency. 2015-03-04 11:00:39 +01:00
marshmellow42 39676885b4 Merge remote-tracking branch 'upstream/master' 2015-03-03 20:44:37 -05:00
Martin Holst Swende 27eabcdccb Added brackets around crc field in protocol listings 2015-03-02 21:05:44 +01:00
marshmellow42 40b9bb85e6 oops... should this file should not have been there 2015-03-02 14:44:05 -05:00
marshmellow42 8d960002c8 lf cmds fix, add, show 
show command to UI:
data printdemodbuffer - allow printing of demod buffer
Add:
data askgproxiidemod - demod a gproxii tag

Fix:
adjust lf simxxx commands further for testing
 2015-03-02 14:42:55 -05:00
marshmellow42 ec9882b18c PSKDemod Bug Fix 2015-02-22 21:11:25 -05:00
marshmellow42 3f41e73c7f PSK demod adjustment 
add carrier length test to weed out false positive demods
 2015-02-22 20:09:58 -05:00
marshmellow42 3bc66a96fe added PSK2 to lf simpsk 
testing still ongoing.
 2015-02-21 22:54:52 -05:00
marshmellow42 872e3d4d6f NEW lf simpsk 2015-02-21 21:36:02 -05:00
marshmellow42 b4a2fcf676 Split output from nrz raw demod function 
missed this one last time
 2015-02-21 18:37:15 -05:00
marshmellow42 4ac906d1c2 split output from rawdemod functions 
now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod
 2015-02-21 00:27:48 -05:00
marshmellow42 40148ab609 Merge remote-tracking branch 'upstream/master' 2015-02-19 21:38:17 -05:00
marshmellow42 abd6112fc4 Revert "Revert "lf simask, lf simfsk and bug fixes"" 
This reverts commit e396001c47.
 2015-02-19 21:35:34 -05:00
marshmellow42 e396001c47 Revert "lf simask, lf simfsk and bug fixes" 
This reverts commit fb0c84c3df.
 2015-02-19 21:22:05 -05:00
marshmellow42 fb0c84c3df lf simask, lf simfsk and bug fixes 2015-02-19 21:21:11 -05:00
Martin Holst Swende 0387cd3393 Merge pull request #68 from iceman1001/feature 
ADD: identifications.
 2015-02-19 10:51:10 +01:00
Martin Holst Swende 181e6db6a9 Merge pull request #67 from marshmellow42/master 
Small help and command description updates
 2015-02-19 10:50:51 +01:00
Martin Holst Swende 1defcf606f More work on iclass full simulation, and some work on iclass tag dump parsing 2015-02-19 10:48:33 +01:00
Martin Holst Swende b67f7ec359 Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode 2015-02-18 20:02:44 +01:00
Martin Holst Swende 9a9bcea82b Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper 2015-02-17 23:17:43 +01:00
Martin Holst Swende 41524d8a39 Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem 2015-02-17 22:07:40 +01:00
iceman1001 0853ffa29c ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's 2015-02-16 19:06:24 +01:00
iceman1001 33315928fb CHG: added some more token-tags. 2015-02-16 19:05:59 +01:00
marshmellow42 8db0534ed1 Merge remote-tracking branch 'upstream/master' 2015-02-14 21:16:27 -05:00
marshmellow42 cc2ea5ed82 Clean up Helps and command descriptions 2015-02-14 21:15:13 -05:00
Martin Holst Swende a4749080d9 Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side 2015-02-14 21:18:39 +01:00
Martin Holst Swende 534445139c Reformatted 2015-02-14 21:17:08 +01:00
Martin Holst Swende 7781a65656 Started work on 'hf iclass eload' - only client side so far, not yet supported in the device 2015-02-14 21:15:53 +01:00
Martin Holst Swende 428d622160 Fixed bug with iclass dump which prevented saving to file 2015-02-14 20:42:23 +01:00
marshmellow42 abd16c456a fix help on data rawdemod commands 2015-02-13 21:17:15 -05:00
Martin Holst Swende 2e2fc9fa6b Merge branch 'master' of github.com:Proxmark/proxmark3 2015-02-13 19:59:50 +01:00
Martin Holst Swende 699bb9dc27 Removed some dev- printouts 2015-02-13 19:59:28 +01:00
Martin Holst Swende 17c60b1248 Merge pull request #63 from marshmellow42/master 
lf data combine rawdemods & depreciate cmds
 2015-02-13 10:11:40 +01:00
Martin Holst Swende 37735250ca Merge pull request #66 from iceman1001/feature 
ADD:  identification of EM4233
 2015-02-13 10:11:09 +01:00
Martin Holst Swende 8b9393d3bd fixed issue #65 2015-02-12 08:21:58 +01:00
pwpiwi 19a700a8b5 hf 14a: if the tag supports it, set default timeout according to ATS 
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started
 2015-02-11 22:20:22 +01:00
iceman1001 070e36d421 ADD: identification of EM4233 2015-02-11 17:14:26 +01:00
Martin Holst Swende 61972abbdd Merge branch 'master' into GenericTracing 
Conflicts:
	armsrc/iso14443a.c
 2015-02-10 21:25:14 +01:00