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

1262 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 105ce39607 FIX: two parentheses were missing. 
FIX: setting the default key to Oxff bug. (http://www.proxmark.org/forum/viewtopic.php?pid15325#p15325)
FIX: proper initialisation of variables ;)
 2015-04-07 18:05:35 +02:00
iceman1001 cff17e78f5 FIX: a wrong comment inside default_toys.lua 
FIX: a wrong linking to default_toys.lua in tnp3 scripts.
 2015-04-07 18:02:29 +02:00
iceman1001 ba3fd680fb FIX: fixed a bug in "hf mf csetblock" where it didn't used the "w" wipe parameter before. 
CHG: minor textual changes.
 2015-04-06 18:52:20 +02:00
iceman1001 7949523515 CHG: default_toys.lua is now able to correct identify over 200 different types. 2015-04-06 18:49:44 +02:00
iceman1001 c3fe354b19 CHG: fix the default_toys.lua file to handle more aspects of information for a given tag. 
CHG: corrected a bug in tnp3clone.lua that made the script fail to "wipe" a magic tag.
CHG: minor textual change in ndef_dump.lua
 2015-04-06 18:47:53 +02:00
iceman1001 aa77d2b125 FIX: the test scripts hade a problem when sending the new configuration block. 2015-04-05 17:02:13 +02:00
iceman1001 5ac81d0f58 CHG: change the snprint call in GetModelStrFromCID. 
CHG: tighten up the maxium allowed errors in Biphase (from 1 to zero allowed errors)
 2015-04-05 14:28:29 +02:00
iceman1001 6c81ae5574 CHG: the default_toys.lua has the index bytes in mix endiansness. I tried to clean it up and verify them. 
CHG: The tnp3clone.lua is now faster, and uses the "wipe" parameter to clean the tag before writing all data.
 2015-04-05 14:27:12 +02:00
iceman1001 b3a8c87d5c CHG: minor text changes. 
CHG: cmd+2, to skip first inparameter in string.
 2015-04-02 12:08:57 +02:00
iceman1001 7b47fa9b3d CHG: Script now also test to read block 0 via the chinese magic command if the normal read fails. 2015-04-02 12:07:51 +02:00
iceman1001 49dc1d0a9e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/lfops.c
	client/cmdlft55xx.c
	common/ldscript.common
	common/lfdemod.c
 2015-04-01 18:02:10 +02:00
iceman1001 b8f705e73e ADD: added some changes from Marshmellow 
CHG: minor change to the help text for "LF HITAG WRITE"
 2015-04-01 17:58:35 +02:00
iceman1001 218103efd3 ADD: added some changes from Marshmellow 
CHG: some minor changes to decode output for EM..
 2015-04-01 17:57:07 +02:00
iceman1001 815544537c CHG: code cleanup , added the year control to t55xx trace command. 2015-04-01 17:55:44 +02:00
iceman1001 7a2029ec7c ADD: some changes from Marshmellow 2015-04-01 17:54:19 +02:00
iceman1001 f2019c773d CHG: minor comments. 2015-04-01 17:53:33 +02:00
iceman1001 e204bb7fb2 CHG: revert -O2 -> -Os compile 2015-04-01 17:52:24 +02: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
pwpiwi f83c41c75b Merge pull request #89 from pwpiwi/image_shrink 
Reclaim more than 19K of ARM flash memory.
 2015-03-31 22:57:33 +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
pwpiwi 7009555e44 temporarily revert lfdemod float removal 2015-03-31 21:38:58 +02:00
marshmellow42 a4669d6ef3 small fix in t5 trace data 2015-03-31 11:30:16 -04:00
marshmellow42 75cbbe9a69 remove floats per piwi 2015-03-31 10:49:06 -04:00
pwpiwi e335ca2846 Reclaim more than 19K of ARM flash memory. 
- added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint)
- removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image
- moved the fpga images to the data section to avoid reserving unused space for a separate section
 2015-03-31 08:07:26 +02:00
iceman1001 02d352fea7 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	armsrc/lfops.c
	client/cmdlf.c
	common/lfdemod.c
	include/usb_cmd.h
 2015-03-30 21:11:37 +02:00
iceman1001 ec09716a65 CHG: removed some commented code. 2015-03-30 16:32:04 +02:00
iceman1001 ba765c9edc CHG: minor correction to the em410xsim help text. 2015-03-30 16:31:13 +02:00
iceman1001 46c65fed6c CHG: adding some variable initalisation to the Uart. 2015-03-30 16:29:30 +02:00
iceman1001 7c99b4f782 CHG: Added the parameters -fdata-sections -ffunction-sections to common/Makefile.common for making the .elf filesize smaller. 
REF: https://github.com/Proxmark/proxmark3/issues/83
 2015-03-30 16:27:07 +02:00
iceman1001 aa60d1560e NEW: HF MFU SETPWD - set password to a Ultralight C tag. 
NEW: HF MFU SETUID - set UID to a magic UL / UL-C tag.   *not implemented*
CHG: minor alignment for "Hf list" output.
CHG: removed unneeded function parameters to the ultralight commands
CHG: the const MAX_MIFARE_FRAME_SIZE is changed to MAX_FRAME_SIZE in the ultralight commands since the UL-Ev1 can have bigger frames than 18bytes.
CHG: adding DES support for the Ultralight-c read commands on deviceside.
 2015-03-30 16:24:03 +02:00
iceman1001 4076250660 CHG: minor fixes to some tnp luascripts 
ADD:  a script to make a barebone clone for tnp3 on a chinese magic s50 generation 1 tag.
 2015-03-30 16:15:53 +02:00
Martin Holst Swende 616970b3d1 Created a changelog, to be used in accordance with http://keepachangelog.com 2015-03-30 07:51:45 +02: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 070e3c4305 Merge remote-tracking branch 'upstream/master' 2015-03-27 23:49:14 -04: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
Martin Holst Swende 337288f9ac Merge pull request #86 from marshmellow42/master 
Fixed indents to Tabs from Spaces
 2015-03-25 20:23:41 +01:00
marshmellow42 e0165dcf3a Fixed indents to Tabs from Spaces 
Spacing changes ONLY - no code changes
 2015-03-25 14:24:36 -04:00
Martin Holst Swende 062e28912c Merge pull request #84 from marshmellow42/master 
EM410x bug fix
 2015-03-25 11:10:51 +01:00
marshmellow42 327a690813 EM410x bug fix 2015-03-24 23:05:46 -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
iceman1001 0ec548dc21 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
 2015-03-24 11:45:31 +01:00
Martin Holst Swende 90a8b82fb4 Merge pull request #82 from marshmellow42/master 
lf ata55x7 commands and more
 2015-03-24 11:10:16 +01: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
iceman1001 754a35e72b ADD: added the ioprox checksum test to IOdemodFSK 
MENTIONED HERE:  http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
ADD:  changed the layout of the HID descramble patterns a bit,  and rearranged some hex/dec outputs.
 2015-03-23 17:11:45 +01: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
iceman1001 9552d5919b ADD: Added em410x de-scramble patterns: Paxton, Sebury, Pattern1. 2015-03-20 11:48:47 +01:00
iceman1001 6255c8b107 FIX: printEM410x - DEZ 10 was missing highest byte. 
ADD: printEM410x - Now prints DEZ 3.5B
ADD: printEM410x - Now prints DEZ 3.5C
 2015-03-19 22:50:23 +01:00