Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 15:26:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
1871 commits 3 branches 11 tags 34 MiB
Commit graph

1871 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleg Moiseenko e17660d5f7 code cleaning (#445) 2017-10-26 19:09:53 +02:00
Oleg Moiseenko 5d7d0c3af9 small improvement in tests (test result in green or red) (#448) 2017-10-26 18:32:18 +02:00
Iceman 8dd0118673 Merge pull request #440 from merlokk/c3 
improve appveyor.yml
 2017-10-26 11:46:20 +02:00
Oleg Moiseenko 8bdb6043b0 identification fix for magic chinese cards (#444) 
* fixed #411
 2017-10-25 07:56:03 +02:00
Iceman 5cc1ff44b4 Merge pull request #443 from doegox/flush 
Flush stdout when waiting for /dev/ttyACM0
 2017-10-24 14:28:16 +02:00
Philippe Teuwen 8a50d60617 Flush stdout when waiting for /dev/ttyACM0 2017-10-24 14:10:52 +02:00
pwpiwi 23af9327a5 fix hw status (and USB comm in general) (#434) 
* don't ignore ReadLine() errors (Windows)
* lock CmdBuffer with Mutex
* refactor WaitForResponseTimeoutW
 2017-10-24 07:48:38 +02:00
Iceman a6d4e93cb5 Merge pull request #438 from pwpiwi/fpga_14b 
FPGA changes ISO14443B:
 2017-10-23 15:05:07 +02:00
merlokk b5381d70dc added write-host for tests 2017-10-23 13:43:46 +03:00
Michael Farrell 05b6b11785 Multiple USB-CDC changes (attempt 6) (#439) 
- Fix reporting of string descriptors.
- Add note about ModemManager matching on the manufacturer string.
 2017-10-23 09:04:06 +02:00
merlokk 9764d3ea0e normally show powershell scripts 
it needs to have no spaces at the end of lines and no `;`
 2017-10-22 22:20:44 +03:00
merlokk da36bed90d added testing timeout 40 sec to avoid hang VM 2017-10-22 21:47:19 +03:00
pwpiwi d372569b45 FPGA changes ISO14443B: 
* slightly increase reader field strength
* increase sensitivity when reading, allowing increased reading distance
 2017-10-21 10:36:01 +02:00
pwpiwi bb04ef216d small fix: make iso14a_set_timeout() external 2017-10-20 20:20:07 +02:00
Oleg Moiseenko ef9746cb2f added CI appveyor.com (#436) 2017-10-20 19:11:02 +02:00
pwpiwi 6e49717b5e fix hf mf sim (issue #412) (#419) 
* move to separate files mifaresim.[ch]
* check CRC of commands
* don't execute commands without successfull authentication
* ensure correct timing of REQA, WUPA, ANTICOL and SELECT responses
* trace reader commands immediately, only fix start time after tag response. Decreases time to be ready for next reader command.
* remove iso14443-4 remnants
* trace raw reader commands instead of decrypted ones
* some refactoring

* fix hf mf sim
* timing: decrease time to get ready for new reader commands
 2017-10-20 17:55:13 +02:00
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