Commit graph

416 commits

Author SHA1 Message Date
iceman1001 57b20f9392 added prime256v1 / secp256r1 curve 2020-12-10 11:41:04 +01:00
iceman1001 df288873ff adapt test for new output 2020-12-10 07:56:35 +01:00
Ryan Saridar afc904cbc7
Fix mistaken increment and decrement constants 2020-12-10 02:00:18 +00:00
iceman1001 93d00be4c0 adapt indala test for new output 2020-12-09 10:28:58 +01:00
iceman1001 1b3d9fbb76 adapt test 2020-12-04 00:18:11 +01:00
iceman1001 dfecb6a5ee lf indala - finished cliparser changes 2020-12-02 14:50:24 +01:00
iceman1001 50be1c72b3 adapt nedan test to new output 2020-12-02 13:00:12 +01:00
iceman1001 4bb63577c6 iclass chk / lookup / loclass - speedups 2020-11-28 13:46:16 +01:00
iceman1001 951bbb95ee adapt to new output 2020-11-05 19:56:03 +01:00
tcprst 4c333ff02f
Update references to hf iclass loclass 2020-11-01 21:02:51 -05:00
Philippe Teuwen c046ac3d50 dfev3 pk 2020-10-27 10:26:36 +01:00
iceman1001 9a73048008 adapt text for FDXB 2020-10-12 14:33:17 +02:00
Philippe Teuwen 2ee9ea0ef3 Add Destron 2020-10-12 13:42:33 +02:00
Philippe Teuwen 0c6cf90ad3 fix tests 2020-10-12 01:00:38 +02:00
Philippe Teuwen 76701af8a7 Make clear current FDX in Pm3 is FDX-B only 2020-10-11 22:38:52 +02:00
iceman1001 6454e168fb adapt for data load changes 2020-10-09 22:25:33 +02:00
iceman1001 0f6016e2f6 adapt tests for new commands 2020-10-09 21:11:18 +02:00
iceman1001 eb05cadb1c hid 2020-10-07 01:29:00 +02:00
iceman1001 3abdf1c651 reverse mem fix 2020-10-07 00:14:41 +02:00
Philippe Teuwen 491adacb94 get rid of tabs 2020-10-06 20:45:13 +02:00
Philippe Teuwen 008c920db0 Add incognito option to avoid manglign history & logs during tests 2020-10-06 18:11:45 +02:00
iceman1001 64f9bb5e01 style 2020-10-06 18:00:00 +02:00
iceman1001 92a768ce0e fix regression test since lf hid demod output has changed 2020-10-06 17:23:15 +02:00
Philippe Teuwen 042342dc8f fpga_compress: fix mem leak 2020-10-06 16:57:04 +02:00
iceman1001 f2078ec0c2 free args 2020-10-06 16:17:22 +02:00
Philippe Teuwen b4058bc72c reorg traces 2020-09-29 17:35:48 +02:00
Philippe Teuwen d22ee1091b fix Presco demod 2020-09-29 00:36:35 +02:00
Philippe Teuwen aadf62bd1f Add test & trace for gproxii 2020-09-28 17:30:13 +02:00
Philippe Teuwen a82c3bdc1f add lf tests and traces 2020-09-28 17:15:35 +02:00
Philippe Teuwen 3e0cc83e3c textual 2020-09-26 18:31:15 +02:00
Philippe Teuwen b1c641724b recover_pk selftests 2020-09-26 17:58:16 +02:00
Philippe Teuwen 58eb9faa84 recover_pk: remove sslcrypto dep 2020-09-26 17:58:16 +02:00
Philippe Teuwen 56c99d223c recover_pk: seach with and without sha256 2020-09-24 11:58:17 +02:00
Philippe Teuwen 55224eed75 recover_pk: add note about hashes 2020-09-24 11:25:43 +02:00
Philippe Teuwen 31c96ae7cf Add script to recover PKs 2020-09-24 10:07:18 +02:00
iceman1001 0d58488bec text 2020-09-14 22:22:40 +02:00
iceman1001 ca3fe1db4a more regression test, gproxII, idteck 2020-09-14 22:22:16 +02:00
iceman1001 113ca294a1 lock 2020-08-20 10:41:00 +02:00
iceman1001 2c930064a3 clean up and proper init 2020-08-19 23:00:08 +02:00
Philippe Teuwen b134753a08 cryptorf: style 2020-08-19 22:19:46 +02:00
Philippe Teuwen a76596c3fe cryptorf: minor tweak 2020-08-19 22:17:58 +02:00
Philippe Teuwen 9ade745f07 rework cryptorf 2020-08-19 21:48:25 +02:00
iceman1001 5525cefd19 commented out crf since it needs to be adapted for a modern libnfc 2020-08-19 15:25:50 +02:00
iceman1001 073e79553e added the securememory simulator_recovery code by @Roel et al 2020-08-19 15:24:32 +02:00
Philippe Teuwen 4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001 62d9b403b4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 into fpga 2020-08-03 21:22:13 +02:00
James Cook 40be40518d update bin2eml script from https://github.com/samyk/samytools/ 2020-07-31 18:05:42 -07:00
iceman1001 804e2661f3 key file py script - @ikarus 2020-07-14 15:55:44 +02:00
iceman1001 0d4c537ede version info for FeliCa fpga image 2020-07-08 11:05:04 +02:00
iceman1001 fb2735ef86 text 2020-06-27 00:07:09 +02:00
Aram Verstegen 99734474fb Little optimization for hitag2hell attack 2020-06-22 22:34:05 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Philippe Teuwen fa0b658436 Remove zlib entirely, no need for fpga_compress anymore to compress hardnested tables, now to be compressed with bzip2 2020-06-08 02:50:43 +02:00
Philippe Teuwen 15012198f9 client: replace zlib by bzip2 2020-06-08 02:50:43 +02:00
iceman1001 1bb7b041c0 resource leaks 2020-06-07 20:45:55 +02:00
iceman1001 5c43caa6b1 fix: ftell uses long int 2020-06-07 19:36:48 +02:00
iceman1001 9a2a5496c0 fix, resource leaks 2020-06-07 19:33:32 +02:00
Philippe Teuwen ef6b775f9f lz4/fpga_compress: avoid alignment problems
fpga_compress.c:176:32: warning: cast from 'char *' to 'int *' increases required alignment from 1 to 4 [-Wcast-align]
        const int cmp_bytes = *(int*)(compressed_fpga_stream.next_in);
                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2020-06-07 13:10:59 +02:00
Philippe Teuwen df9f34ba2b lz4/fpga_compress: remove warning missing-braces
fpga_compress.c:154:49: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
    LZ4_streamDecode_t lz4StreamDecode_body = { 0 };
                                                ^
                                                {}
2020-06-07 13:02:51 +02:00
slurdge cb03286420 fpga_compress uses lz4 2020-06-03 16:07:35 +02:00
iceman1001 1b9490c6aa cppchecker 2020-06-02 13:07:25 +02:00
iceman1001 b0b51e4222 cppchecker 2020-06-02 13:05:19 +02:00
iceman1001 dec92755b6 cppchecker 2020-06-02 13:04:23 +02:00
iceman1001 8ecc1f64f8 fix: adapt return check 2020-05-29 10:22:56 +02:00
iceman1001 9417122714 fix unused_result 2020-05-27 20:40:03 +02:00
iceman1001 2ae85dea4e fix memleak 2020-05-27 20:33:25 +02:00
iceman1001 6370551dd5 unreadvariable 2020-05-27 20:29:53 +02:00
Philippe Teuwen 6e5de1090a pm3_tests: cosmetic 2020-05-23 23:59:10 +02:00
Philippe Teuwen 4df2727ab7 ht2crack5: faster test 2020-05-23 23:47:33 +02:00
Philippe Teuwen 077b156b2f add ht2crack5 test 2020-05-23 17:07:14 +02:00
Philippe Teuwen 6d33c0b784 Bring hitag2crack tools in main Makefiles 2020-05-23 13:33:32 +02:00
Philippe Teuwen 278db15f5a Move tests to tools/pm3_tests.sh and add "make check" to call it 2020-05-22 18:35:27 +02:00
Philippe Teuwen 0a2eb6783c chmod perl scripts 2020-05-22 12:41:19 +02:00
iceman1001 d40251ff0b Revert "Release v4.9237 - Ice Coffee "
This reverts commit 833bc4d9a3.
2020-05-21 21:55:15 +02:00
iceman1001 833bc4d9a3 Release v4.9237 - Ice Coffee 2020-05-21 21:55:15 +02:00
iceman1001 a19ba257af fix: #746 - ProxSpace 64b seem to report both _WIN32 and _WIN64 2020-05-21 21:45:54 +02:00
Philippe Teuwen bf5c054414 Revert "Release v4.9230 - Ice Coffee "
This reverts commit db2e97c860.
2020-05-21 12:51:35 +02:00
Philippe Teuwen db2e97c860 Release v4.9230 - Ice Coffee 2020-05-21 12:51:35 +02:00
Philippe Teuwen 4382f8c9be mkversion: add --undecided 2020-05-21 11:50:03 +02:00
iceman1001 3e389c6e07 Revert "Release v4.9224 - Ice Coffee "
This reverts commit 9cec93fd54.
2020-05-21 09:25:32 +02:00
iceman1001 9cec93fd54 Release v4.9224 - Ice Coffee 2020-05-21 09:25:32 +02:00
iceman1001 521a76d3c2 Revert "Release v4.9222 - Ice Coffee "
This reverts commit a5aeadc339.
2020-05-21 09:24:38 +02:00
iceman1001 a5aeadc339 Release v4.9222 - Ice Coffee 2020-05-21 09:23:32 +02:00
Philippe Teuwen e2a20631c7 remove section version_information for client 2020-05-20 21:11:45 +02:00
Philippe Teuwen ef586c2a41 version info also for client, still cmake to do 2020-05-20 21:11:45 +02:00
iceman1001 3dd55e2c04 simpler define 2020-05-19 20:53:52 +02:00
Iceman 6a87bdd44e
Merge pull request #739 from grspy/master
Fix 32-bit time_t compilation error on WIN64
2020-05-19 20:47:49 +02:00
grspy 8509d233d2 Fix 32-bit time_t compilation error on WIN64 2020-05-19 20:49:25 +03:00
Philippe Teuwen cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
Philippe Teuwen 5984e1c03e makefiles: allow to skip pthread (for termux) 2020-05-15 17:40:59 +02:00
Philippe Teuwen a739d33398 Add mf_nonce_brute from https://github.com/iceman1001/mf_nonce_brute and merge to pm3 Makefile 2020-05-15 13:07:27 +02:00
iceman1001 af47a3fd34 chg: copied from pm3 repo 2020-05-13 20:16:29 +02:00
Philippe Teuwen b3f84bf7b3 make style 2020-04-29 19:41:45 +02:00
iceman1001 1b16b95565 cppchecker fix 2020-04-28 22:39:04 +02:00
iceman1001 4a282b32c2 cppchecker fix 2020-04-28 13:29:19 +02:00
iceman1001 b03f9402c1 cppchecker fix 2020-04-28 13:29:16 +02:00
iceman1001 2280442492 chg: adjust number of threads according to cpu 2020-04-28 11:02:19 +02:00
Philippe Teuwen a7c286cc9a hitag2crack compile flags 2020-04-26 22:41:41 +02:00
Philippe Teuwen b01d1f0aa2 Avoid printing size_t in ht2crack5 for Mingw 2020-04-26 22:36:02 +02:00
Philippe Teuwen f7f33f2732 Revert "Makefile: move mingw defines to Makefile.host"
This reverts commit 0665b3f40a.
2020-04-26 22:30:41 +02:00
Philippe Teuwen 0665b3f40a Makefile: move mingw defines to Makefile.host 2020-04-26 17:36:15 +02:00
iceman1001 dd5679a53a cppchecker fixes 2020-04-26 13:49:06 +02:00
Philippe Teuwen fbe4e20326 remove c99 and c++11 restrictions 2020-04-24 16:43:21 +02:00
Philippe Teuwen 0181d5c8f0 ht2 cleaning tools 2020-04-04 15:09:57 +02:00
Philippe Teuwen b513300ea4 ht2 common files 2020-04-04 14:32:03 +02:00
Philippe Teuwen 8ab297ae6a add new ht2 tools, thanks to anonymous donator 2020-04-04 14:03:21 +02:00
Philippe Teuwen 5277a95364 clean a bit ht2 helpers 2020-04-04 14:02:21 +02:00
Philippe Teuwen 837a53a75b revamp a bit ht2 readmes & makefiles 2020-04-04 14:02:21 +02:00
iceman1001 a24c7334cf cppchecker - invalidprintf 2020-03-24 13:20:50 +01:00
iceman1001 2f85bced17 cppchecker func name 2020-03-13 15:04:07 +01:00
iceman1001 c46119d755 cppchecker - format print 2020-03-13 15:03:11 +01:00
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