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

9489 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 849be2376c textual 2020-06-09 09:19:25 +02:00
iceman1001 a0cbaee138 chg: mad makeover 2020-06-09 08:51:12 +02:00
Iceman 147be1765c
Merge pull request #762 from lukaskuzmiak/remove-duplicated-mfc-keys 
remove duplicated keys (first occurrence kept)
 2020-06-09 07:45:59 +02:00
Lukas Kuzmiak eb35636f49 remove duplicated key (first occurrence kept) 2020-06-08 17:26:03 -07:00
Philippe Teuwen de100fc8e7 Add SKIPPYTHON support to cmake 2020-06-09 00:47:34 +02:00
Philippe Teuwen 66505988a2 Add SKIPPTHREAD support to cmake 2020-06-09 00:39:35 +02:00
Philippe Teuwen 6358c07ec1 Add SKIPQT support to cmake 2020-06-09 00:34:41 +02:00
Philippe Teuwen 45b5bbed7b Add SKIPBT support to cmake 2020-06-09 00:27:50 +02:00
Philippe Teuwen c76b3061da Fix more deps/liblua Android cross-compilation 2020-06-08 20:20:16 +02:00
Philippe Teuwen 526407ed5c Fix deps/liblua Android cross-compilation 2020-06-08 19:18:08 +02:00
iceman1001 86c649f955 chg: "lf viking demod" - prepping for lib 2020-06-08 18:43:34 +02:00
iceman1001 618a945e55 fix missing semi 2020-06-08 13:19:01 +02:00
Philippe Teuwen 6894749978 Android: Fix bug introduced in e0371987ac 2020-06-08 12:44:14 +02:00
Iceman 7f17b9243c
Update Troubleshooting.md 2020-06-08 11:17:33 +02:00
Philippe Teuwen 90775638b1 Revert "fix: osx doesn't like target directive" 
This reverts commit 690db96a7d.
 2020-06-08 11:07:45 +02:00
iceman1001 e756b9c908 chg: swap from xenial to bionic as build 2020-06-08 10:38:32 +02:00
iceman1001 990d33e109 fix: appveyor checks for bz2 2020-06-08 10:21:17 +02:00
iceman1001 a7799a5bf8 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-08 09:23:16 +02:00
iceman1001 8f8d42652b remove dependency 2020-06-08 09:23:08 +02:00
Iceman e0371987ac
Update CMakeLists.txt 
We swapped from zlib to  bz2
 2020-06-08 09:11:13 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Philippe Teuwen a1eb8e78b6 adapt get_lz4.sh 2020-06-08 03:11:16 +02:00
Philippe Teuwen e5a97f3e80 dockerfiles for tests 2020-06-08 02:53:13 +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
Philippe Teuwen 8418e89180 fix gitignore, was masking tools/fpga_compress 2020-06-08 02:49:38 +02:00
iceman1001 690db96a7d fix: osx doesn't like target directive 2020-06-07 22:05:54 +02:00
iceman1001 93dbb24103 ftell return signed 2020-06-07 20:46:29 +02:00
iceman1001 1bb7b041c0 resource leaks 2020-06-07 20:45:55 +02:00
iceman1001 d0b22cbd95 coverty 290397, 290399 2020-06-07 20:11:36 +02:00
iceman1001 307e39bb22 exposing function 2020-06-07 19:47:36 +02:00
iceman1001 a9d89c7d06 fix: RAMFUNC 2020-06-07 19:46:41 +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
iceman1001 8dd56a9004 fix resource leak 2020-06-07 19:29:14 +02:00
iceman1001 ae10e76cb5 fix resource leak 2020-06-07 19:25:56 +02:00
iceman1001 45f98b721c Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-07 19:23:56 +02:00
iceman1001 79ce948bc3 warnings protype missing 2020-06-07 19:23:48 +02:00
Philippe Teuwen 07c6e124c5 textual 2020-06-07 19:20:36 +02:00
Iceman fc1f137f0c
Merge pull request #759 from slurdge/lz4_new 
[WIP] Zlib->LZ4 change
 2020-06-07 18:43:44 +02:00
iceman1001 7f5c9a2681 textual 2020-06-07 18:40:12 +02:00
Philippe Teuwen efa055ff41
Merge pull request #760 from slurdge/thumb 
Move most of libs to thumb mode.
 2020-06-07 18:19:29 +02:00
slurdge 33781b1fd8 Move most of libs to thumb mode. 2020-06-07 17:29:25 +02:00
iceman1001 4e29909cc2 chg: pointer casting to sort out array out of bonds 2020-06-07 15:59:06 +02:00
iceman1001 09548ecf51 cleaning some code 2020-06-07 13:56:21 +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
Philippe Teuwen b2c7ded7fc Adapt get_lz4.sh 2020-06-07 12:53:24 +02:00
Philippe Teuwen 381b47f64e lz4: add memmove to arm string.c 2020-06-07 12:46:34 +02:00
Philippe Teuwen d48fcbf5eb lz4stream info to int: use memcpy 2020-06-07 12:46:05 +02:00