Commit graph

1840 commits

Author SHA1 Message Date
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
pwpiwi edf8806f15 fix lf io clone (issue #331):
- remove confusing message about simulation
- add h (help) parameter and usage text
2017-07-13 18:12:53 +02:00
pwpiwi 3f7aaf24fb revert removal of quarter frequency support for hi_read_rx_xcorr.v 2017-07-13 08:48:27 +02:00
Fl0-0 7906cb41ff Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compatibility (#349)
* Improve 'Magic' Mifare tags detection

* Magic Mifare tags detection and version printing

* Magic s50/1k tag halt error correction for cload and csave

* hf mf c* commands for gen1b

* Use |= for bitwise operation

* gen1b: don't issue wipe command and don't expect response from WUPC1 magic command after a SELECT_UID: old UID display works in hf mf csetuid

* hf mf cgetsc compatibility for 4k

* hf mf csave compatibility for 4k

* hf mf cload compatibility for 4k, suppress halt errors messages for debug level 2

* Revert to MF_DBG_ERROR level in mifare_classic_halt() and don't issue the halt command for gen1b

* Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compatibility
2017-07-12 15:58:32 +02:00
marshmellow42 0e2ddb4196 add data fsktonrz fsk cleaning util (#352)
add fsk cleaning / demod tool fsktonrz
- used old fskdemod for HID and adjusted it to build the tone tables for any fsk model detected or given.  using the tone tables we are able to convert the fsk to clear strong NRZ/ASK even with very weak fsk waves.
- also fixed a small textual bug in `lf search u` output
- also added more graph clearing code to help ensure the demod overlay doesn't show when it shouldn't...
- and improved strong NRZ clock detection.
- fixed bugs in places it used old static values instead of dynamic read values. and removed redundant items.
2017-07-12 07:31:42 +02:00
Iceman 53814fe4f2 Merge pull request #351 from Fl0-0/CmdEM410xBrute_mingw_fix
Fix CmdEM410xBrute string format warning
2017-07-06 09:25:03 +02:00
Fl0-0 03a4837bfa Fix CmdEM410xBrute string format warning 2017-07-05 21:16:15 +02:00
Michael Farrell 067bfc8b76 Refactoring uart interface (#341)
* uart: Major cleanups
- Adds documentation to the uart API.
- Fixes a buffer overflow issue in `uart_receive`, where the maximum parameter was ignored.
- Splits the maximum length and bytes recieved variables in `uart_receive`.
- Downsizes the receive buffer to the minimum required, saving 16MiB of RAM at runtime.
- Refactors the POSIX and Win32 implementations of uart into separate files.
- Removes the unused `uart_{get,set}_parity` functions, which were not implemented on Win32.
2017-07-05 20:22:02 +02:00
Henrik Johansson 52244230d3 hitag2 write (#310)
Usage is similar to hitagS write: lf hitag write 24 KEY pagenumber 32bitvalue
* added changlelog entry
2017-07-05 20:16:54 +02:00
marshmellow42 979c76556a fix some iclass reader bugs (#350)
endless loop in reader if no tag was found
button press on pm3 did not cancel.
led_b was left on in some cases
also moved 14b detection to last in hf search to help speed up the
command for the other tags.  14b is slow (does multiple tests)
Thanks to @Fl0-0 and @pwpiwi for their idenfication of some of the
issues.
2017-07-05 18:11:48 +02:00
Iceman ebe9a3ba04 Merge pull request #347 from Fl0-0/master
LF EM410x bruteforce typo errors correction
2017-07-03 09:34:48 +02:00
Fl0-0 cea3dc4e9e Fix typo in helps 2017-07-03 09:16:28 +02:00
Fl0-0 e8e2cfd0f1 missing a c in the helptext sample 2017-07-03 08:56:36 +02:00
Iceman fe8157d59e Merge pull request #343 from Fl0-0/master
LF EM410x bruteforcing function by simulating EM410x tags (1 UID/s)
2017-07-03 08:56:19 +02:00
Fl0-0 1dc0500b36 Update changelog 2017-07-03 08:04:24 +02:00
Fl0-0 2ed09d15e4 Merge remote-tracking branch 'upstream/master' 2017-07-02 17:54:35 +02:00