github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-10 23:42:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
2355 commits 3 branches 11 tags 34 MiB
Commit graph

2355 commits

This branch
This branch
All branches
Author SHA1 Message Date
Iceman
ed6f29f317 Merge pull request #435 from ytisf/master 
Fixing liblua issues
 2017-10-20 17:54:36 +02:00
tisf
1df4df6d8a Fixing liblua issues 
On MacOS might have issues with compilation. This should fix it in a case where liblua used is not the built in one.
 2017-10-20 21:55:13 +07:00
Oleg Moiseenko
aa757f71d9 proxmark3 refactoring command line parameters (#417) 
* add -c (execute command from command line)
* fix: sometimes proxmark executes command twice...
* fix: start proxmark from QT was in a strange way (if we issue command very fast - it hangs)
* added -l (execute lua script)
* rework help
* small memory management bugfix
* small fix in executing command files
* enable piping from STDIN
 2017-10-20 06:49:53 +02:00
Oleg Moiseenko
36b1cdd1b4 fix fpga_comress sending no-error messages to stderr (#430) 2017-10-19 12:23:09 +02:00
Iceman
544f3fae91 Merge pull request #427 from pwpiwi/usb_mods 
Improve device side USB implementation.
 2017-10-18 22:08:07 +02:00
Oleg Moiseenko
0c86cb0127 Check keys in hf mf nested (issue #426) 
* hf mf nested added 14a timeout for check keys
* hf mf nested added options s and ss
 2017-10-18 21:44:59 +02:00
pwpiwi
f194e4290c Device side USB implementation: 
* add some comments and #defines in usb_cdc.c
* use full FIFO size of 64 Bytes for device -> host transfers
 2017-10-17 19:25:40 +02:00
Iceman
9d0a333449 wrong define used (#421) 
The set define under the case "STD_SET_CONFIGURATION" is not the same as here.
The endpoint is configured as INTERUPT not ISOCHRONOUS
 2017-10-16 18:16:39 +02:00
Iceman
a008a74541 Merge pull request #420 from merlokk/b_fix 
small fix #416
 2017-10-16 10:36:49 +02:00
merlokk
73d7bf75c8 small fix #416 2017-10-16 11:33:17 +03:00
Oleg Moiseenko
275d9e61c2 Check keys in hf mf nested and hf mf chk (#414) 
Improve hf mf chk and hf mf nested
* hf mf chk. added interrupt of procedure by usb
* extract mifare default keys into separate module
* arm side multisector `hf mf chk`
* hf mf nested. change key search procedure
* hf mf nested. added key check after we have found a key.
* small fix hf list f
* hf mf chk. add timeout (arm side) and some tweaks.
 2017-10-15 21:19:34 +02:00
Iceman
77aecdd286 Merge pull request #407 from pwpiwi/no_rats 
Don't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX, …)
 2017-10-06 02:36:06 +02:00
pwpiwi
7085af051d fix LUA script errors 2017-10-05 18:07:26 +02:00
Oleg Moiseenko
adf023ffe3 hf mf nested add some functionality (#403) 
* Added nested auto mode. it checks known keys and then launches nested
* Check if we allready have all keys after nested
 2017-10-05 13:37:51 +02:00
pwpiwi
5d8f664d7a Adjust LUA scripts to new ISO14A_NO_RATS option 2017-10-04 18:28:57 +02:00
pwpiwi
c04a4b60ce Don't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX, ...) 2017-10-01 17:52:10 +02:00
Iceman
5191ad9e55 Merge pull request #405 from ZenSecurity/master 
Added bus blaster (http://dangerousprototypes.com/docs/Bus_Blaster) c…
 2017-09-29 12:02:10 +02:00
Iceman
0060e3daa2 Merge pull request #402 from pwpiwi/env_flags 
Don't ignore environment variables CFLAGS and LDFLAGS
 2017-09-29 12:01:54 +02:00
Mikhail Yushkovskiy
ab92e6c301 Added bus blaster (http://dangerousprototypes.com/docs/Bus_Blaster) configuration for AT91SAM7S512 support in openocd. 2017-09-27 23:37:46 +03:00
pwpiwi
340f50a53c Don't ignore environment variables CFLAGS and LDFLAGS for tools as well 2017-09-26 18:15:19 +02:00
pwpiwi
f53eb07de0 Don't ignore environment variables CFLAGS and LDFLAGS 
* they are be set by some build environments to find include and lib dirs
 2017-09-26 18:06:51 +02:00
Iceman
c19f26b05d Merge pull request #393 from pwpiwi/fix_getclocktime 
Fix clock_gettime() for Apple OSX
 2017-09-26 17:08:50 +02:00
Fl0-0
a2d058f3aa Fix typo and gcc-7 warnings (#401) 
* Fix typo in hf mf csave help
* Fix gcc 7 warning: '~' on an expression of type bool [-Wbool-operation], use logical ! not instead of ~
* Fix gcc 7 warning: ‘memset’ used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size]
* Fix gcc 7 warning: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier]
 2017-09-26 16:36:05 +02:00
marshmellow42
1ece662f0f Merge pull request #400 from merlokk/master 
fixed #395
 2017-09-26 07:38:24 -04:00
merlokk
2ce43a28f7 fixed #395 2017-09-26 14:29:08 +03:00
Oleg Moiseenko
3a05a1e739 reworking magic cheneese card wipe (#365) 
Implement hf mf cwipe. Remove wipe parameter from hf mf csetuid.
 2017-09-22 19:40:42 +02:00
pwpiwi
d47c8c701a Fix clock_gettime() for Apple OSX 
(also fixes hf mf hardnested)
 2017-09-20 07:32:15 +02:00
Iceman
08b7cd17a5 Merge pull request #392 from pwpiwi/expr_fix 
Fix detection of AVX512 support for Apple clang compiler
 2017-09-13 19:02:05 +02:00
pwpiwi
de1e68d34b Fix detection of AVX512 support for Apple clang compiler 2017-09-12 09:09:15 +02:00
marshmellow42
8c8317a5e9 fix lf sim fpga download overwrites sim buffer (#391) 
* adjust LFSim to download lf fpga prior to setting emulation buffer to prevent buffer overwrite condition if you are coming from HF fpga.
* fix lf sim big buff overwrite with fpga download. Move fix to the buffer download cmd.
 2017-09-11 19:18:32 +02:00
marshmellow42
1dae9811f2 Indala fixes - set accurate preamble and start of.. (#385) 
.. data for both format types (64 bit and 224 bit)
also adjust 224 bit demod and clone to output and input in PSK2 instead
of PSK1 as this appears to be most common for this format.
 2017-08-27 12:10:28 +02:00
uzlonewolf
c6c0449105 Don't try to display the GUI when running in textmode (#387) 
* Don't try to display the GUI when running in textmode

* Updated textmode fix to always run the GUI under Windows
 2017-08-27 12:09:39 +02:00
Fl0-0
a221bacd43 Fix gcc version detection (from iceman1001 fork), fix issue #386 (#388) 2017-08-27 12:08:48 +02:00
iceman1001
14d7657703 fix: 'hf mf nested' - got an initialized bug from the monster merge 2017-08-27 00:32:22 +02:00
marshmellow42
5c814c3a9f helptext fixes (#384) 2017-08-22 18:33:12 +02:00
pwpiwi
930763e86d Use PolarSSL DES implementation (GPL 2 or later) for both client and firmware (#378) 
to prevent licensing issues with ARM-Crypto-Lib (GPL 3 or later)
 2017-08-22 10:04:47 +02:00
marshmellow42
fe087813f6 Merge pull request #356 from pwpiwi/low_frequencies 
revert removal of quarter frequency support for hi_read_rx_xcorr.v
 2017-08-21 15:29:56 -04:00
pwpiwi
d0067d0768 Fix compile issues for mfkey32 and mfkey64 after Pull Request #380 2017-08-18 07:50:03 +02:00
etmatrix
4efdfbe638 Fixes 2 bugs in mifare simulate (#380) 
- Check button press when there is NOFIELD, so we can exit also without FIELD
- struct nonces_t is moved to include/mifare.h so client and arm has the same definition
 2017-08-17 16:59:48 +02:00
pwpiwi
6b758d652d Prevent using x86 SIMD compiler flags on aarch64 (ARM) architecture 2017-08-16 08:50:31 +02:00
marshmellow42
f2081c4356 adjust lf simulation - fix one bug + attempt... (#369) 
... to speed up the loops waiting for carrier signal to go high or low
by only checking for a halt (button press or usbpol) every 1000th loop
iteration.
some users were experiencing modulating reactions to be too slow.
 2017-08-08 21:08:59 +02:00
pwpiwi
8cf533fd98 FIX: 'lf hid sim' - it now prints the id correct ref https://github.com/Proxmark/proxmark3/issues/364 2017-07-27 18:35:12 +02:00
Iceman
6f7a0f7d86 Merge pull request #362 from merlokk/master 
small fix formatmifare.lua
 2017-07-22 13:38:30 +02:00
merlokk
0e512a905f small fix formatmifare.lua 2017-07-21 19:36:49 +03:00
Iceman
8614a5a271 Merge pull request #361 from marshmellow42/master 
fix lf get sample bits vs bytes bug
 2017-07-18 09:06:49 +02:00
marshmellow42
c68f5fc7ec fix lf get sample bits vs bytes bug 2017-07-17 17:40:10 -04:00
marshmellow42
26ea310f0e Merge pull request #355 from pwpiwi/io_fix 
fix lf io clone (issue #331):
 2017-07-14 12:27:41 -04:00
marshmellow42
d8f2ff3293 Merge pull request #358 from Fl0-0/Fix_missing_reference_PAC_Stanley 
Fix missing reference for PAC/Stanley
 2017-07-14 12:24:24 -04:00
Fl0-0
48d41dc320 Fix missing reference for PAC/Stanley 2017-07-14 17:45:09 +02:00
marshmellow42
69f42a0593 add lf PAC/Stanley tag read (#354) 
lf pac read - read from antenna and demod
lf pac demod - demodulate from graphbuffer
fix typo in securakey
 2017-07-14 14:04:46 +02:00