RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 18:57:12 +08:00
Code Issues Projects Releases Packages Wiki Activity
4448 commits 3 branches 15 tags 87 MiB
Commit graph

50 commits

Author SHA1 Message Date
RFID Research Group
63260df31e
Merge pull request #23 from xilni/master 
feature: Handle Kastle format 32 bit cards
 2018-09-14 08:03:21 +02:00
Chris
0a648d482d chg: remove warning unused variable 2018-09-09 23:16:47 +02:00
Chris
24eaac8681 CHG: the thread comms refactoring from offical pm3 repo 
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
 2018-09-06 21:43:20 +02:00
xilni
ecb0f21184 feature: Handle Kastle format 32 bit cards 2018-09-04 22:23:49 -04:00
iceman1001
49c8ec65f5 typoo 2018-06-03 23:39:55 +02:00
iceman1001
a2c7158f78 fixes from #616 2018-06-03 23:32:02 +02:00
iceman1001
0248352ea6 chg:simpler debug printing 2018-02-21 16:41:39 +01:00
Brian Pow
cafa0649f5 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow
b1d414c680 CHG: replace 'samples:' with 'Examples:', unify some usage text 2018-02-09 22:56:16 +08:00
iceman1001
b89b3399dc FIX: if receiving array isnt large enough, previously this will smash the stack.. 2017-12-02 20:45:53 +01:00
iceman1001
9c9daae30f chg: swapped return value to bool 2017-09-14 11:08:24 +02:00
iceman1001
eae8c2f7be chg: unify debug messages for FSK demod in AWID,HID,IO,PARADOX,PYRAMID, all neat and same. 2017-08-11 20:48:54 +02:00
iceman1001
b4d7ed4862 chg: 'lf awid brute' - added verbose logging option 
chg: 'lf hid brute' - added verbose logging option
 2017-08-11 18:13:58 +02:00
iceman1001
734ca940e9 fix: unified lf clone printouts of blocks. 2017-08-11 11:38:54 +02:00
iceman1001
bd4d1ec74e Fixes: lf simpsk - make sure Carrier input is ok. 
fix: 'lf awid sim' - Clk param is used CorreCt
fix: 'lf HID sim' - unified way logging
fix: 'lf indala sim' - adding a draft simulation Command
fix: 'lf io sim'  - unified way logging
fix: 'lf nedap sim' - getting bits is wrong still..
fix: 'lf paradox sim'  - Helptext
lfdemod.C  got some reworked loops,  still some debug messages to be ...
 2017-08-10 14:19:57 +02:00
iceman1001
3384999c83 CHG: some help text edited and rearrange the commands to be in the same order 2017-08-09 18:33:30 +02:00
iceman1001
f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001
e4ae456772 FIX: 'lf hid sim' - it now prints the id correct 
ref  https://github.com/Proxmark/proxmark3/issues/364
 2017-07-26 09:41:09 +02:00
iceman1001
195102e9ae fixes 2017-07-14 21:22:03 +02:00
iceman1001
9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001
464f6dc571 CHG: lf hid wiegand got some love. Still not correct. 2017-02-07 22:27:28 +01:00
iceman1001
fbc2bace4a CHG: 'lf hid wiegand' - remaking the wiegand calcs 2017-01-11 23:02:07 +01:00
iceman1001
a0a61c91cc CHG: adding the HID wiegand calcs again. Still need to set the bit37 indicator etc. 2017-01-09 22:17:43 +01:00
iceman1001
8cdf15c2b3 CHG: 'lf awid brute' - extra check if device gotten offline 
CHG: 'lf t55x7 brute' - extra check if device gotten offline
CHG: 'lf nedap' - Nedap is supposed to be Diphase.
 2016-12-19 14:55:58 +01:00
iceman1001
7aa24806f4 FIX: the check for formatlen was wrong. 
Still missing the other formats,  only 26bit in this one.
 2016-08-26 22:31:45 +02:00
iceman1001
89603cbddc FIX: minor adjustments to 'lf awid bruteforce' 
FIX: making the 'lf hid bruteforce' to work the same way as the awid one..
 2016-08-26 17:18:48 +02:00
iceman1001
80920fac96 FIX: forgot a semicolon 2016-08-03 00:42:23 +02:00
iceman1001
34c81fe01c FIX. COVERITYscan 133860, initialize to zero. This function is still not working but at least now it doesnt crash the client. 2016-08-03 00:13:33 +02:00
iceman1001
e92948c60c FIX: that OEM variable that is unused. 2016-07-28 22:22:34 +02:00
iceman1001
758f5ee3e5 CHG: removed the wiegand converting, since I'm not happy with how its implemented. This is rework in progress. 2016-07-28 21:50:54 +02:00
k02a
e13ccb6b3f Inclusion of unused oem variable 
When compilation of the current source code, I am getting the warning of setting the unused variable "oem". I have included this, along with minor spelling corrections/language updates in the menu system.

gcc -std=c99 -O3 -mpopcnt -march=native -g -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall -DHAVE_GUI -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED  -c -o obj/cmdlfhid.o cmdlfhid.c
cmdlfhid.c: I funktion "CmdHIDWiegand":
cmdlfhid.c:292:11: varning: variabeln "oem" sätts men används inte [-Wunused-but-set-variable]
  uint32_t oem;
           ^

Before:
pm3 --> lf hid wiegand 0 101 2001
HID 26 bit | FC: 101 CN: 2001 | Wiegand Code: 0000002004CA0FA2          
[...]
HID 40 bit | FC: 101 CN: 2001 | Wiegand Code: 0000000000000FA2

After:
pm3 --> lf hid wiegand 0 101 2001
HID 26 bit | OEM: 0 FC: 101 CN: 2001 | Wiegand code: 0000002004CA0FA2          
[...]
HID 40 bit | OEM: 0 FC: 101 CN: 2001 | Wiegand code: 0000000000000FA2
 2016-07-22 09:49:02 +02:00
iceman1001
c2a714e3ce ADD: forgot to add the bruteforce command to the commandtable. *experimental, its a simple bruteforce* *not tested* 
CHG: some textual changes to helptext.
 2016-02-16 21:11:17 +01:00
iceman1001
4c36581b96 CHG: clearCommandBuffer(); before calling cmdparser. 2016-02-14 15:24:11 +01:00
iceman1001
e1ad67eaf2 FIX: Coverity Scan fixes, a bunch of them. 2016-01-16 22:58:44 +01:00
iceman1001
3a532acfe1 ADD: "lf hid bruteforce" for a simple bruteforce attact against a HID reader. *work in progress* 2016-01-13 00:16:11 +01:00
iceman1001
fc893f8e33 FIX: minor fixes to the HID wiegand generation command. Still not complete 2016-01-09 17:20:06 +01:00
iceman1001
f4fbfb83e2 ADD: @go_tus 's code to generate wiegand codes from FacilityCode/SiteCode and Cardnumber. Almost there, formatlength supported is 26,34,35,37,38,40,44,75,84, when its finised. 2016-01-08 14:28:13 +01: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
iceman1001
3fe4ff4f03 CHG: generic code clean up. Removal of commented code. 
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
 2015-01-05 15:51:27 +01:00
marshmellow42
083ca3de73 LF HID & IO prox fixes/options 2014-12-17 09:51:40 -05:00
cex123@gmail.com
38b20f7550 Fixed LF HID cloning command 2013-03-13 07:13:19 +00:00
roel@libnfc.org
d16d20b1fb fixed CMD_HID_SIM_TAG 2013-03-10 11:37:59 +00:00
roel@libnfc.org
54a942b05d merged all patches into CDC repository 2013-02-28 17:04:23 +00:00
roel@libnfc.org
28fdb04fd8 Finally, rewrote bootrom and flasher program, much faster now 2013-02-28 15:11:52 +00:00
roel@libnfc.org
902cb3c00b major USB update 2012-12-04 23:39:18 +00:00
cex123@gmail.com
ec09b62d88 2011-10-15 15:15:49 +00:00
izsh@fail0verflow.com
035303ac5f client/cmdparser.c: Remove the leading spaces before calling the subparser. client/cmdlfhid.c: Modify accordingly. 2010-03-06 00:30:24 +00:00
adam@algroup.co.uk
f443ff3ebc fix id offset in hid simulate 2010-03-05 23:39:07 +00:00
izsh@fail0verflow.com
a553f26748 Add License/Copyright headers/notices. Please add your own copyright notice if you have made any nontrivial changes or additions to the code. There are several files without any attribution, currently. 2010-02-21 00:47:22 +00:00
izsh.f0f
7fe9b0b742 Client cleanup and restructuring. Stage 1... 
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.

The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P

The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.

Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)

client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.

client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.

client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.

client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.

include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.

common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.

armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.

common/Makefile.common, armsrc/Makefile: Modify accordingly.
 2010-02-04 01:27:07 +00:00