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

145 commits

Author SHA1 Message Date
Philippe Teuwen ff194eb861 CmdHF15Write: make sure truncated string is null-terminated 2019-04-09 20:02:41 +02:00
iceman1001 ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
Fl0-0 be90c76f47 Fix sizes for GCC 8.2 string truncation warnings 2019-04-09 09:45:06 +02:00
iceman1001 a8ad793f7f more crc overshadow 2019-04-07 12:10:04 +02:00
iceman1001 c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
Philippe Teuwen 41f36ca20b make style 2019-04-06 19:09:01 +02:00
iceman1001 c03e425550 chg: 'hf 15 restore' - fail message added 2019-04-03 15:42:42 +02:00
iceman1001 0383d7f052 chg: 'hf mf restore' - add finish message 
chg: 'hf mfu restore' - add finish message
chg: 'hf 15 restore' - add finish message,  close filehandle when failing.
 2019-04-03 15:34:36 +02:00
iceman1001 35592b979d unsigned long long 2019-03-18 23:43:44 +01:00
osboxes.org 9c2736d1eb spaces 2019-03-14 12:30:32 +01:00
iceman1001 1f8040596f fix: 'hf 15 dump f' - now also selects card 2019-03-14 10:23:58 +01:00
Philippe Teuwen 98ff923d61 fix more strncat usage (one must specify available room, not total dest buffer size) 2019-03-12 22:06:37 +01:00
Philippe Teuwen 1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
iceman1001 cc81b5bed9 fix: tolower 2019-03-09 12:31:29 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
iceman1001 06ade9970a FIX: mem leaks 
FIX: 'hf mf nested' - params
 2019-02-20 22:29:39 +01:00
iceman1001 a4f6701c85 chg: cleaning 2019-02-18 16:16:24 +01:00
iceman1001 e6c68645e3 chg: colors 2019-02-18 13:28:22 +01:00
iceman1001 77f4492433 fix: 'hf 15 write' - faulty string formatter token 2019-02-02 19:30:32 +01:00
Chris 50143e460d syntax 2018-09-23 20:41:29 +02:00
Chris 6176103023 cleanup 2018-09-09 12:36:44 +02:00
Chris 5f77121694 initial commit to be in sync the-soon-defunct repo pm3rdv40. 2018-08-12 21:54:31 +02:00
iceman1001 c41013d394 chg: printandlogex now deals with string which has inital newline char. 2018-04-27 11:22:30 +02:00
iceman1001 71ce6e07ee CHG: moved trace commands into its own category (from hf) 
'trace list'

there will also the load / save of trace buffer come.

For backwardfunctionality the old commands still works.
 2018-03-18 18:00:41 +01:00
iceman1001 24482211ad chg: the dot progress is not logged anymore. Force fflush afterwards. 2018-03-05 20:07:29 +01:00
Brian Pow a352dbd93f migrate some usage text to call PrintAndLogOptions() 2018-03-01 23:55:13 +08:00
Brian Pow e0121a3bfd reformat usage text 2018-02-27 22:59:15 +08:00
Brian Pow c0c89a0e7b implement 'hf 15 restore' 2018-02-24 21:45:51 +08:00
Brian Pow 43ec321e53 tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow 4afe5e6ce0 tweak messages 2018-02-21 20:43:50 +08:00
Brian Pow d8c8874bdf use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Federico Cerutti 58ddd53fb0 Removed hf 15 select: broken command 2018-02-15 00:13:27 +01:00
iceman1001 e09d5385bf chg: clearing some mem.. 2018-02-14 15:27:39 +01:00
iceman1001 97803733ce fix: 'hf 15 raw' - wrong length when using -c param 
https://github.com/iceman1001/proxmark3/issues/174
 2018-02-14 15:24:45 +01:00
Brian Pow b1d414c680 CHG: replace 'samples:' with 'Examples:', unify some usage text 2018-02-09 22:56:16 +08:00
Brian Pow 39d2a92ead CHG: use FillFileNameByUID() for filename generation for 'hf 15 dump' 2018-02-09 22:54:54 +08:00
iceman1001 52d69ed4ee CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all. 2018-02-01 15:19:47 +01:00
iceman1001 b39332e938 REM: 'hf 15 debug' removed command, unified with mf_debuglevel instead. The idea is to have ONE debug flag on deviceside. 2018-01-29 15:58:00 +01:00
iceman1001 e873c1decd chg: 'hf 15' updated some helptexts 2017-12-24 10:33:14 +01:00
iceman1001 6327b767fc fix: 'hf 15 read' - the correct comparison helps out a lot. 2017-12-21 16:02:19 +01:00
iceman1001 c8f087eeb9 fix: 'hf 15 dump' the crc now calcs over the right number of bytes in order to be compared with the check 2017-12-21 15:44:23 +01:00
iceman1001 2f3dbbcaa3 rename: ul_switch_off_field -> DropField (inside cmdhf14a.c) 
chg:  Fix memory bounds error (@wsmoses)
 c3511781a1
 2017-11-11 23:23:01 +01:00
iceman1001 ee1612870c CHG: 'info' unified helptext. 
ADD: 'hf 14a info'  - skeleton function
 2017-10-30 12:17:32 +01:00
iceman1001 6d98779ff8 chg: 'hf 15 read' - nice output and with lock info 
chg: 'hf 15 readmulti' - nicer output and with lock info

You can still break the client if you ask to read too many blocks at one time.
I suggest 'hf 15 dump' instead for that purpose
 2017-09-06 22:04:00 +02:00
iceman1001 6542633c0e chg: 'hf 15 write' wrong helptext :) 2017-09-06 12:58:32 +02:00
iceman1001 a130b58c82 add: 'hf 15 dump' added save data to file. It saves two files (EML/BIN) 2017-09-06 12:55:21 +02:00
iceman1001 1c5d040ceb chg: 'hf 15 findafi' - informativ message 2017-09-05 10:34:31 +02:00
iceman1001 b526492d3d fix: 'hf 15 dump' memset bug 2017-09-05 09:53:20 +02:00
iceman1001 9d0ce1e874 chg: 'hf 15 reader' minor output changes 
chg: 'hf 15 info'  minor output changes
 2017-09-05 08:25:23 +02:00
iceman1001 59af999763 chg: 'hf 15 info' - this fixes some of the bugs. For instance, get_systeminfo responses doesn't have a CRC. No need to verify crc :) 
Also if prepare command fails, not finding uid,  don't continue...
 2017-09-05 00:25:53 +02:00
iceman1001 3e6bf31d13 CHG: got tired of the sub command line 'hf 15 cmd', so I moved them and change names on those most confusing commands. Also added some helptext changes. This will make the commands seem "similar" to the other HF commands like : 14a/14b/iClass/legic 
renamed commands:
'hf 15 read'    -> 'hf 15 samples  : it also downloads the collected samples direct.  So you can try 'hf 15 demod' afterwards to see if you can demodulate the signal.
'hf 15 dumpmem' -> 'hf 15 dump'    : wil also need a save to file option

'hf 15 cmd sysinfo' -> 'hf 15 info' : yep, shorter and not working at the moment. breaks when tag doesn't respond to 0x2B.
'hf 15 cmd raw' -> 'hf 15 raw'
'hf 15 cmd raw' -> 'hf 15 raw'

new commands
'hf 15 list'     : just a shortcut to print the tracelog
'hf 15 restore'  : the idea is to read a file and restore the blocks back to a tag.  *to be implemented*
 2017-09-04 23:45:35 +02:00
iceman1001 85b1c6bdfb add: 'hf 15 list' is now possible, since I like to be able to call both "hf list 15" and "hf 15 list"... 
chg:  'hf list 15' better annotations,  the flags doens't define the command anymore
chg:  device side,  iso15,  experimenting with different settings.

The tag still doesn't answer to  0x002B  not 0x202B---uid---  commands.
 2017-09-04 22:48:35 +02:00
iceman1001 ec07e2e006 FIX: 'hf 15 *' commands - the demod should work better now and as a bonus I've added some tracelogging. The timer is not quite correct yet but its a start. 
sample:
   hf 15 reader
   hf list raw
 2017-09-04 13:56:57 +02:00
iceman1001 c0948b5d7b chg: 'hf 15 *' first rehaul of the iso15693 commands. Call it a refactor, Started adding helptext, 'h' parameter, usage of sprint_hex 
chg: cmdhf15.h - extern keyword in headerfile
 2017-09-01 20:34:17 +02:00
iceman1001 c75ce57dfd chg: added clearCommandBuffer(); 2017-08-31 15:16:12 +02:00
iceman1001 c5616dfe76 minor corrections.. 2017-08-29 15:47:26 +02:00
iceman1001 823a814cf6 FIX: some possible null - ref bugs in 'iclass' , 'iso15693' deviceside. 
FIX: 0 is not a reference.
FIX: iso15693 - wait wasn't implemented
chg: 'hf 15' getTagInfo_15 renamned.
chg: 'hf iclass loclass' some output got newline
 2017-08-19 09:49:41 +02:00
iceman1001 7d0efb37d8 CHG: the "indent" software warns about some assingments. I've tried to fix them. 2016-09-26 10:37:00 +02:00
iceman1001 52eeaef568 CHG: moved a defince arraylen into util.h and changed to uppercase. 2016-08-04 21:54:11 +02:00
iceman1001 8949bb5dad Added @marshmellow42 "hf search" 2015-05-13 09:13:42 +02:00
iceman1001 595b623bf4 CHG: removed an extra space. 2015-03-16 11:40:44 +01:00
iceman1001 3ac59c7fed Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/crapto1.c
	armsrc/iclass.c
	client/nonce2key/crapto1.c
 2015-03-06 09:02:15 +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 5b3811fc0e ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's 2015-02-16 19:01:09 +01:00
iceman1001 070e36d421 ADD: identification of EM4233 2015-02-11 17:14:26 +01:00
iceman1001 00a863f9ad ADD: identification of EM4233 2015-02-11 17:08:16 +01:00
iceman1001 52ab55ab0d ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. 
ADD: added a manufacturer list in "hf 14a reader",  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: detect chinese magic backdoor commands in "hf 14a reader"
CHG: minor code clean up.
 2015-01-07 21:06:15 +01: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
Martin Holst Swende 90e278d3da Fixed several issues found using a coverity-scan 2014-10-27 21:46:04 +01:00
roel@libnfc.org b1231445c7 removed unused compiler directives, cleaned up some code 2013-10-09 09:59:14 +00:00
roel@libnfc.org 7bb9d33e2c fixed warnings on Mac OS 10.8, xcode 5 2013-09-25 10:40:16 +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
adrian@atrox.at 0546b4aaf7 added more cards to iso15693 uid database, and some minor cleanups 2012-06-20 17:15:21 +00:00
dn337t@gmail.com 7853775ee2 added CmdHF15CmdReadmulti using Adrian's second patch from issue 20 2012-05-29 12:31:29 +00:00
dn337t@gmail.com 65a23af22b textual changes: error messages and comments by Andrian + attribution 2012-05-29 12:22:08 +00:00
dn337t@gmail.com 05151b6fe8 added head comments on CmdHF15Cmd{Read,Write} using Adrian's second patch from issue 20 2012-05-29 12:17:24 +00:00
dn337t@gmail.com eba61a5647 clarification in 'hf 15 cmd write' message using Adrian's second patch from issue 20 2012-05-29 12:12:00 +00:00
dn337t@gmail.com fdb67f1c8d implemented output of received octets in 'hf 15 cmd raw' 2012-05-18 12:26:50 +00:00
dn337t@gmail.com 6d7234cd43 added 'hf 15 cmd sysinfo' using Adrian's second patch from issue 20 2012-05-18 09:20:27 +00:00
dn337t@gmail.com c43897de27 typofix in prepareHF15Cmd comment based on Adrian's second patch from issue 20 2012-05-18 09:10:44 +00:00
dn337t@gmail.com 382223b9a9 fixed offset in 'hf 15 cmd read' to avoid losing the first octet/byte 2012-05-18 09:07:39 +00:00
dn337t@gmail.com e8da774090 boolean fix in 'hf 15 cmd read' using Adrian's second patch from issue 20 2012-05-18 09:05:00 +00:00
dn337t@gmail.com e4da8ed0bb typofixes in ISO15693 getUID head comment 2012-05-18 08:59:22 +00:00
dn337t@gmail.com c71e7235da extended ISO 15693 UID map using Adrian's second patch from issue 20 2012-05-17 14:35:19 +00:00
dn337t@gmail.com b4a9d8419f implemented ISO 15693 error message decoding and fixed error code offset 2012-05-17 13:25:50 +00:00
dn337t@gmail.com 31b6e9af2b Removed unused variables, added implicitly used headers 2012-05-14 14:48:23 +00:00
adam@algroup.co.uk 9455b51c2a Issue 20 patch (refactored code of the iso15693 implementation as well as several enhancements) [Adrian Dabrowski "atrox"] 2010-10-19 14:25:17 +00:00
izsh@fail0verflow.com fddf220a8b Add -O3 on the client's side and fix yielding warnings 2010-02-21 20:01:56 +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