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
10944 commits 3 branches 14 tags 86 MiB
Commit graph

305 commits

Author SHA1 Message Date
iceman1001 21e6cff4ba format printf 2020-03-13 14:42:04 +01:00
iceman1001 022eacecdc format 2020-03-13 14:37:49 +01:00
iceman1001 a9aaa3040e cppchecker - format print 2020-03-13 14:34:18 +01:00
iceman1001 53ecdaf78f cppcheck func name 2020-03-13 14:14:30 +01:00
iceman1001 c3024fe9f2 cppcheck shadow 2020-03-13 14:14:19 +01:00
iceman1001 c7d2ccb8bd cppchecker function name 2020-03-13 13:52:08 +01:00
iceman1001 6f1ed5a9bf cppchecker shadow var 2020-03-13 13:51:54 +01:00
iceman1001 8a3f2d03ac style 2020-03-09 16:54:42 +01:00
iceman1001 c73517b64d style 2020-03-09 16:44:07 +01:00
iceman1001 b485461fba style 2020-03-09 16:43:14 +01:00
Philippe Teuwen 3319556695
Merge pull request #565 from sigwinch28/convert-python2-to-python3 
convert python2 mfd2eml and eml2mfd scripts to python3
 2020-02-21 16:51:45 +01:00
Philippe Teuwen ba6f58cc05 findbits converted to python3 + tests 2020-02-21 16:45:00 +01:00
Joe Harrison f28404581d convert python2 mfd2eml and eml2mfd scripts to python3 2020-02-21 15:36:48 +00:00
Philippe Teuwen aa6fc60a22 xorcheck script converted in python3 + test 2020-02-21 16:29:52 +01:00
Philippe Teuwen 5527cb2428 pm3_mfdread.py script python3 and warn for bitstring module 2020-02-21 16:17:56 +01:00
Philippe Teuwen 2177211b7a btaddon scripts: warn for pyserial 2020-02-21 16:06:40 +01:00
Iceman c0a30405e8
Merge pull request #561 from sigwinch28/use-env-for-shebangs 
Use /usr/bin/env in shebangs
 2020-02-21 15:24:50 +01:00
Joe Harrison 788e8b7ecc Remove potentially undefined exit behaviour from analyzesize tool 
Python2.7 doc for `sys` module states that "Most systems require [the
exit code] to be in the range 0-127, and produce undefined results
otherwise".

Currently, modern Linux-based systems will exit with code 255, while
msys2-based systems such as Proxspace will exit with code 127.

Instead, explicitly exit with non-zero exit code of 1.
 2020-02-21 13:50:09 +00:00
Joe Harrison 5e88faa2cf use env in shebangs in pm3-flash-fullimage and rest of tools 2020-02-19 16:13:17 +00:00
Joe Harrison 7d157606ee Use /usr/bin/env in shebangs 
Stop assuming that bash is in /bin, and that perl and python are in
/usr/bin, etc.
Instead, use env command to find these commands in the path.
 2020-02-18 00:00:24 +00:00
iceman1001 bc3f0c4da8 fix: #555 fpga_compress missing tarbin directive 2020-02-12 09:52:23 +01:00
iceman1001 317b4c32e5 hitag2crack stuff from RFidlar repo 2020-01-16 11:11:14 +01:00
iceman1001 31daa9e302 added hitag2crack 2020-01-16 10:43:13 +01:00
osboxes.org b205833df4 style 2019-12-31 22:30:59 +01:00
Samy Kamkar 5f7fe45f58 Support multiple files, sanitize input, detect sox 2019-12-23 15:43:49 -08:00
iceman1001 9e41221be1 chmod 2019-12-23 22:53:10 +01:00
iceman1001 1472922c9e Add: two perl scripts from https://github.com/samyk/samytools/. Thanks @samyk! \n pm3_cs8.pl converts pm3 files to wave. \npm3_amii_bin2eml.pl convert / decrypts amiiboo dumps to eml format used when simulating. 2019-12-23 22:52:50 +01:00
merlokk 45926261db style 2019-12-06 17:12:29 +02:00
iceman1001 bb5c4d6162 Add python script to wipe S70 7b Gen2 magic tags. Thanks @vulnersCom 2019-12-03 14:50:48 +01:00
iceman1001 46ba161ba2 ADD file 2019-12-03 14:47:34 +01:00
Philippe Teuwen 5ef4d6dbbb fpga_compress: no previous prototype warning 2019-10-26 18:32:38 +02:00
Philippe Teuwen c6220dc7be fpga_compress: unused parameter warning 2019-10-26 18:32:17 +02:00
Philippe Teuwen c613a758b2 mfkey64: fix sscanf uint8_t clang warning 2019-10-26 18:07:09 +02:00
Philippe Teuwen 2173cadf23 openocd scripts: allow to call them from another dir 2019-10-15 13:06:46 +02:00
Philippe Teuwen a5001de76c less magic trick in fpga_compress for coverity 2019-10-05 19:10:40 +02:00
Philippe Teuwen dc16509539 Simple script to convert pm3 traces to something audible, thanks @rfidiot for the idea 2019-09-25 15:02:40 +02:00
Adam 00344adfd3
subtle change for clarity 
Both interface-raspberrypi.cfg and interface-raspberrypi2.cfg gave conflicting instructions for the dd return value. This should clear that up.
 2019-09-21 13:25:28 -05:00
Ludovic Rousseau a1852eaa4b Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 formated formatted
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 succesfully successfully
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Skiped Skipped
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 standart standard
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 supress suppress
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 successfull successful
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Succeded Succeeded
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Overriden Overridden
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 aquire acquire
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 occured occurred
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 delimeter delimiter
 2019-09-14 17:44:58 +02:00
Philippe Teuwen 5dc63fa239 Add sim011.asm 2019-09-05 09:29:45 +02:00
Philippe Teuwen 27a0402a3d HID flasher: add libusb for Fedora in readme 2019-09-01 20:13:33 +02:00
Philippe Teuwen bd4cce1270 remove global libusb requirement, add note to compile HID flasher 2019-09-01 20:02:55 +02:00
Philippe Teuwen e80fe2588b "which" not always available... 2019-09-01 19:30:51 +02:00
Philippe Teuwen 7e579f9fca rename SIMxxx.BIN in lowercase 2019-08-30 22:13:51 +02:00
Philippe Teuwen f6a4f9cbe3 move client scripts to tools 2019-08-30 22:11:02 +02:00
Philippe Teuwen 4fdb5a2f4b make install: half way 2019-08-30 21:55:13 +02:00
Philippe Teuwen e47969aa95 migrate simmodule/readme.txt content to 2_Configuration-and-Verification.md 2019-08-29 23:43:48 +02:00
Philippe Teuwen 8987e956ac POSIX sh version of mkversion 
Most targeted platforms have "sh" and don't need Perl as requirement.
Still Perl script is present as fallback.
 2019-08-29 23:23:53 +02:00
iceman1001 0d986ab212 Delete unused hash files 2019-08-29 21:57:01 +02:00
Philippe Teuwen e6f2644c1b remove srecswap.pl, never seen modern jtag requiring it 2019-08-29 18:53:54 +02:00
Philippe Teuwen 16a7cfd7b2 make style (excepted cmdhficlass...) 2019-08-26 22:28:39 +02:00
Philippe Teuwen 47c6452e94 typo 2019-08-26 12:50:10 +02:00
Philippe Teuwen 1e97acdf5e remove old arm toolchain installation script 2019-08-21 21:39:21 +02:00
Iceman 3cf64f9f23 fix: some mkdir stuff.. 2019-08-21 16:49:32 +02:00
Philippe Teuwen 6ebae499aa rework fpga_compress & isolate zlib: use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 43ffed1a26 rework nonce2key Makefile, use common crapto1, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen aebfe0af19 rework mfkey Makefile and move util_posix to common, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 5d699610c9 rework hid-flasher Makefile 2019-08-19 21:50:16 +03:00
root 7fc5fe6dd5 chg: unifed the dateformat 2019-08-18 17:43:54 +02:00
Philippe Teuwen 0ab23426d6 OSX workaround to get universal pm3 homebrew formula still working 2019-08-11 22:52:11 +02:00
Philippe Teuwen 47bcee05ad Missing platform in fpga_compress Makefile 2019-08-11 22:30:04 +02:00
Philippe Teuwen 80b4e81130 Fix fpga_compress race condition and isolate it in tools 2019-08-11 21:42:01 +02:00
Philippe Teuwen d19754567d summer restructuring: 
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
 2019-08-11 21:42:01 +02:00
Philippe Teuwen c0eb19acb1 remove tabs 2019-07-24 00:52:24 +02:00
Philippe Teuwen 8e6258936c make style 2019-07-19 13:18:35 +02:00
Philippe Teuwen 41731ea084 analyzesize: create db on first use 2019-07-18 23:42:58 +02:00
slurdge 01e6db5c2e Add a simple tool to analyze elf files 2019-07-18 22:26:01 +02:00
Philippe Teuwen fd5c30f555 jtag tools: add config for RaspberryPi 2019-07-10 22:51:42 +02:00
Philippe Teuwen 1ae85d20d7 jtag tools: add config for FTDI C232HM-DDHSL-0 2019-07-10 22:37:30 +02:00
Philippe Teuwen 4bd15d900b jtag tools: some factorisation 2019-07-10 22:35:29 +02:00
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen 742fe16830 Makefile verbose mode: make V=1 as for CMake 2019-06-02 16:04:35 +02:00
Philippe Teuwen 8c0cd4cfa2 Cleaner makefile execution, use 'make Q=' if you want to see full lines 2019-06-02 00:25:25 +02:00
Philippe Teuwen 86ee0658cf rework rx timings in python scripts 2019-05-23 00:05:45 +02:00
Philippe Teuwen 325825d4a8 hc06 scripts 2019-05-21 00:40:11 +02:00
Philippe Teuwen 5801cfa4a8 Add JTAG support for Shikra, thanks @NinjaStyle82 2019-05-01 01:32:17 +02:00
Philippe Teuwen 2eb4cd9162 jtag comments 2019-05-01 01:31:29 +02:00
Philippe Teuwen 2c5c5fb3d7 sort out jtag config files 2019-05-01 01:24:46 +02:00
iceman1001 05ddd39cae textual, to reflect which repo. 2019-04-28 17:06:07 +02:00
Philippe Teuwen ae5b6fa169 rework shell scripts for easy client or flasher 2019-04-27 11:25:07 +02:00
Philippe Teuwen a555799a7c Stop poking Internet when compiling 2019-04-27 10:41:10 +02:00
Philippe Teuwen 42a03fc9f1 Add openocd config files for JLink 2019-04-25 02:00:23 +02:00
iceman1001 e30dbf3ecd style 2019-04-16 15:22:39 +02:00
iceman1001 87a74e98b8 style 2019-04-16 15:19:53 +02:00
Philippe Teuwen 366c1ec901 style 2019-04-06 00:07:48 +02:00
Philippe Teuwen 9cec581f1c Makefile: remove WINBINS/WINEXES, ProxSpace doesn't use them 2019-03-29 09:49:42 +01:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
Philippe Teuwen b3b5d29452 nonce2key makefile: fix race condition when using make -jN and add header dependency 2019-03-27 22:48:46 +01:00
Gtpy 283e4e707c
Update mfkey64.c 
missing include 65a45fe
 2019-03-18 15:56:39 +01:00
iceman1001 65a45fe187 chg: mfkeys: adapting old refactoring (@piwi) 2019-03-17 13:57:28 +01:00
Philippe Teuwen fd3d4925a2 mfkey: fix file modes 2019-03-17 00:03:22 +01:00
Philippe Teuwen 1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +01:00
iceman1001 2c10dc25a7 FIX: simmodule firmware update. v3.11 2019-03-11 17:52:48 +01:00
Philippe Teuwen 2f12e57408 Makefiles: remove spurious spaces/tabs 2019-03-10 11:35:03 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen bcb33ca5ef tools scripts: fix mix of spaces & tabs 2019-03-09 10:52:45 +01:00
Philippe Teuwen e559a4a5af tools: fix mix of spaces & tabs 2019-03-09 10:46:59 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
Philippe Teuwen edc19f202a Convert the few files with still Windows carriage returns 2019-03-09 08:49:41 +01:00
iceman1001 f943348a7b FIX: detection of presence of git on system. ie downloaded a zip file with everything or precompiled distro may not have git installed. On ubuntu/mingw 'env -S' doesn't exist. 2019-02-18 10:18:55 +01:00
iceman1001 d6063d6776 textual 2019-02-17 16:07:31 +01:00
iceman1001 a01aead732 add: 'make get_xorsearch' - easy download of xorsearch by Didier Stevens, 
see
https://blog.didierstevens.com/programs/xorsearch/
 2019-01-31 16:57:02 +01:00
iceman1001 f7a2af19f8 ADD: sha512, md5 hashes for firmware file. 2018-12-20 12:24:55 +01:00
iceman1001 d4b32f3050 ADD: Sim module firmware upgrade file. v3.10 2018-12-19 23:28:01 +01:00
Colin J. Brigato c74dbb63b8 Pass 2; commit 2; 2018-09-06 05:24:50 +02:00
iceman1001 a11162a9fe chg: bash seems to work better on Ubuntu. Tested on ubuntu, mingw. 2018-04-26 23:16:38 +02:00
iceman1001 1a0a465e11 chg: time time.. 2018-04-26 23:07:50 +02:00
iceman1001 fd3f3bb1ef chg: tries to see if GIT is installed. Simplified substring. 2018-04-26 23:02:53 +02:00
iceman1001 5dc17ae22b clean up 2018-02-04 16:38:55 +01:00
Brian Pow 05f4a81782 FIX: craptev1-v1.1.tar.xz and crapto1-v3.3.tar.xz will be redownloaded even it exists 2018-02-04 22:00:24 +08:00
iceman1001 4e1d6072d2 fix: increase possible state sizes 2018-01-11 21:48:04 +01:00
iceman1001 1b61e01f0e chg: removed whitespaces. 2018-01-09 19:17:21 +01:00
iceman1001 41a2553b04 ADD: a makefile which allows for fast download of some interesting supporting projects, tools to have with the proxmark3. 
-- get @blapost sourcecode for craptoEV1 v1.1
make get_craptev1

-- get @Blapost sourcecode for crapto v3.3
make get_crapto1

-- get @jbfuzier,  @j-run and @iceman1001 tools mf_nonce_brute  and mf_key_brute  (clones three repositories)
make get_nonce_bf
 2017-09-29 14:48:00 +02:00
iceman1001 2b29740dad ADD: another config for openocd #450 (5191ad9e55) (@ZenSecurity) 2017-09-29 14:38:51 +02:00
iceman1001 a68887ce2d FIX: #402 https://github.com/Proxmark/proxmark3/pull/402 (piwi) 2017-09-28 22:31:20 +02:00
iceman1001 d61e712ee4 chg: mkversion.pl may need the fetch. 2017-09-17 19:30:20 +02:00
iceman1001 507fd2d43a CHG: Not sure why we fetch all from git in the mkversion script. It just takes time.. Someone who knows better can explain it to me and I'll revert it back. 2017-09-14 11:17:03 +02:00
iceman1001 51e930bcba fix: extra new line needed 2017-08-21 17:29:47 +02:00
iceman1001 05e160b1f2 fix: https://github.com/Proxmark/proxmark3/issues/12 this should allow for both use-cases to get a nice date. 
A)    ppl uses Git to pull the lastest source.
B)    ppl download the zipfile
 2017-08-20 03:52:06 +02:00
iceman1001 14d6c4fc34 chg: cleaning out timing. 
chg: makefile (piwi)
 2017-03-13 09:45:46 +01:00
iceman1001 9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001 b4762e2712 ADD: new settings file for buspirate and at91sam7s512 ref: a386043fa9 2017-02-21 19:53:40 +01:00
iceman1001 dbbc82968c CHG: got insperation from https://github.com/menshiyun/proxmark3/commits/local and the clean variable. 2016-12-07 17:06:15 +01:00
Michael Farrell 949d50c89b Add .gitignore file to mfkey for binaries 2016-10-27 21:43:33 +11:00
iceman1001 c3b6fdfa5b CHG: saw @menshiyun 's change to localtime on github. 
CHG: make sure that the 'iceman' label is in the version text.  This is purely to make sure if they are using my fork or not.
 2016-09-26 12:28:35 +02:00
iceman1001 d515e7a3a0 CHG: a different version string when compiling on systems without git or the release tags. 2016-09-01 16:11:31 +02:00
iceman1001 a1ab594e24 CHG: change the number of calls to prng_successor was done. Fewer should mean faster :) 2016-08-24 12:35:24 +02:00
iceman1001 77dee16f64 FIX: fixed some compiler warnings about strlen call and sscanf. 
CHG: trying some optimised gcc settings in Makefile
 2016-04-21 14:34:58 +02:00
iceman1001 b416b7d287 CHG: make the text a bit easier to understand. 2016-04-18 13:01:26 +02:00
iceman1001 a81b99b9b1 ADD: @zhovner 's decryption of trace data to mfkey64 2016-04-05 04:49:34 +02:00
iceman1001 838c15a643 ADD: added some time debug statements to be able to measure execution time. 
CHG: change the auth_ex method to send usb package faster,
REM: removed some bucketsort changes.
 2016-02-17 17:30:37 +01:00
iceman1001 7504dc50d5 Merge branch 'master' of https://github.com/iceman1001/proxmark3 
Conflicts:
	armsrc/crypto1.c
 2016-02-16 21:43:45 +01:00
iceman1001 489c39c9a5 CHG: remove clang warning for -O4, 2016-02-16 21:38:36 +01:00
iceman 3989d6fff6 chg: the windows exe annoys the linux compiler 2016-02-15 02:50:00 +01:00
iceman 4211fdce31 chg: the windows exe annoys the linux compiler 2016-02-15 02:49:26 +01:00
iceman1001 685d366c73 ADD: added @piwi's bucketsort to tools/mfkey/crapto1.c and tools/nonce2key/crapto1.c 2016-02-09 15:16:35 +01:00
iceman1001 bf22fab73b FIX: Coverity Scans complain about uninitialized usage of struct. Setting s->ODD and s->EVEN to zero should do the trick. 2016-01-20 11:31:24 +01:00
iceman1001 8130eba4d1 CHG: Syncronized so all different parts uses the same implementation of Crapto1 v3.3 2016-01-19 18:01:16 +01:00
iceman1001 9b98cb88b2 ADD: Wrote a little help text to the nonce2key tools. 2016-01-19 16:26:37 +01:00
iceman1001 a1afa550ea CHG: Crapto1 v3.3 now with comments, and I've tried to unnest some loops. 2016-01-19 16:17:29 +01:00
iceman1001 93b0bbd2dc FIX: the "make clean" for mfkey/Makefile now deletes the executables. 2016-01-17 23:06:48 +01:00
iceman1001 9d1eaa281f FIX: makeing sure the "make clean" now deletes the nonce2key.exe file. 2016-01-17 23:00:50 +01:00
iceman1001 72109f8296 CHG: Updated the crapto1 imp to latest vesion3.3 ( Thanks @blapost !) 2016-01-16 17:49:45 +01:00
iceman1001 43d3f76921 FIX: this should remove some warnings while compiling on linux and when running Travis-CI in a docker container. 
some format specifier for uint64_t
and getting the git history in the perl script.
 2016-01-15 12:43:29 +01:00
iceman1001 db25599d7f ADD: @holiman's clearCommandBuffer in cmdlft55xx.c 
ADD: @VERTCraig's AVID commands.

TEST: testing some changes to iso14443 demod.
 2015-07-18 20:43:14 +02:00
iceman1001 d8af608f8e TEST: Moebius two noce mfkey32... 2015-07-13 23:06:49 +02:00
iceman1001 a198737b44 minor code clean up 2015-05-13 09:18:37 +02:00
iceman1001 7bd30f12ac Small fixes, 
Fix: removed a call to free,  which I think made linux people unhappy during "lf t55xx rd 0"...
Add: "lf t55xx fsk"  now kind of outputs binary from "FSK2a R/40 R/50"..
 2014-10-16 15:05:27 +02:00
ikarus 9c6837165b Updated nameing (svn -> git) & fixed whitespaces. 2014-04-02 21:46:25 +02:00
Martin Holst Swende e3ac0d7095 Fixed so build scripts utilises the git version 2014-04-01 20:52:45 +02:00