]>
git.zerfleddert.de Git - proxmark3-svn/log
pwpiwi [Thu, 2 Nov 2017 20:37:42 +0000 (21:37 +0100)]
Merge branch 'master' into fix_hfmfsim
pwpiwi [Tue, 24 Oct 2017 05:49:14 +0000 (07:49 +0200)]
fix hf mf sim:
* more timing fixes
* correctly determine correction bit (taken from iceman's fork)
* add checking of Access Conditions for Read command
* never allow reading KeyA
merlokk [Thu, 2 Nov 2017 12:28:05 +0000 (14:28 +0200)]
added changelog
Oleg Moiseenko [Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)]
Merge branch 'master' into 14a_rework3
merlokk [Thu, 2 Nov 2017 12:11:42 +0000 (14:11 +0200)]
tlv decoder works.
Oleg Moiseenko [Wed, 1 Nov 2017 19:37:18 +0000 (21:37 +0200)]
added changelog (#460)
Oleg Moiseenko [Wed, 1 Nov 2017 16:48:59 +0000 (18:48 +0200)]
improve `hf 14a info` (#457)
* added validate_prng_nonce from iceman1001 fork
* added DetectClassicPrng from iceman1001 fork
Oleg Moiseenko [Wed, 1 Nov 2017 16:44:43 +0000 (18:44 +0200)]
change comment in iso14443a.c (#459)
merlokk [Wed, 1 Nov 2017 16:34:15 +0000 (18:34 +0200)]
fix behavier reading iso14443-3 and iso14443-4 cards
merlokk [Wed, 1 Nov 2017 16:22:03 +0000 (18:22 +0200)]
revert SAK check
merlokk [Wed, 1 Nov 2017 15:13:27 +0000 (17:13 +0200)]
Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3
merlokk [Wed, 1 Nov 2017 15:02:35 +0000 (17:02 +0200)]
now SAK check is OK
merlokk [Wed, 1 Nov 2017 14:55:12 +0000 (16:55 +0200)]
deleted condition in iso14a select (sak & 0x20 ==0) - error. Usually SAK = 88
marshmellow42 [Wed, 1 Nov 2017 11:57:30 +0000 (07:57 -0400)]
Merge pull request #456 from merlokk/hfreaderfix
fixed bug with `hf search 14a`
merlokk [Wed, 1 Nov 2017 11:54:03 +0000 (13:54 +0200)]
fixed bug with `hf search 14a`
merlokk [Wed, 1 Nov 2017 11:38:29 +0000 (13:38 +0200)]
TLV decoding works
Oleg Moiseenko [Wed, 1 Nov 2017 07:51:05 +0000 (09:51 +0200)]
Add hf mf info, change hf mf reader (#452)
* copy functionality from `hf 14a reader` to `hf 14a info`
* added command `hf 14a reader` with simple anticollision-select procedure.
* add parameters to `hf 14a reader`. may start and end acting as reader
merlokk [Tue, 31 Oct 2017 17:19:49 +0000 (19:19 +0200)]
improved GetAPDUCode()
merlokk [Tue, 31 Oct 2017 17:11:23 +0000 (19:11 +0200)]
small refactoring
merlokk [Tue, 31 Oct 2017 16:14:32 +0000 (18:14 +0200)]
added showing apdu response codes
merlokk [Tue, 31 Oct 2017 14:25:42 +0000 (16:25 +0200)]
move strucrture to .h file
merlokk [Tue, 31 Oct 2017 14:20:23 +0000 (16:20 +0200)]
export apdu function
merlokk [Tue, 31 Oct 2017 14:08:58 +0000 (16:08 +0200)]
apdu sending refactoring
merlokk [Tue, 31 Oct 2017 13:15:57 +0000 (15:15 +0200)]
param parsing convert to procedures
merlokk [Tue, 31 Oct 2017 11:28:16 +0000 (13:28 +0200)]
apdu works.
merlokk [Mon, 30 Oct 2017 15:58:43 +0000 (17:58 +0200)]
fixed bug in CmdHF14ACmdRaw: if we cant select we send command anyway...
merlokk [Mon, 30 Oct 2017 15:29:03 +0000 (17:29 +0200)]
iso14_apdu works via logical channel. not as it needs. it needs to change to raw(
Oleg Moiseenko [Sun, 29 Oct 2017 15:34:51 +0000 (17:34 +0200)]
small fixes in ReaderIso14443a() (#446)
merlokk [Fri, 27 Oct 2017 16:02:45 +0000 (19:02 +0300)]
added sketch for command `hf 14a apdu`
merlokk [Fri, 27 Oct 2017 15:45:42 +0000 (18:45 +0300)]
added `hf 14a apdu` command.
Oleg Moiseenko [Fri, 27 Oct 2017 14:58:24 +0000 (17:58 +0300)]
appveyor.yml. display return values (#451)
* display return values from commands and compare them with value. as promised in #440
pwpiwi [Fri, 27 Oct 2017 07:56:46 +0000 (09:56 +0200)]
Revert "Comms refactor (prerequisite of libproxmark work) (#371)" (#450)
This reverts commit
afdcb8c159a73aba95a017f1cfec98e8fa2b93c1 .
Michael Farrell [Thu, 26 Oct 2017 19:54:27 +0000 (06:54 +1100)]
Comms refactor (prerequisite of libproxmark work) (#371)
* Refactor the comms code only from PR#346, without comms_globals.h.
* OSX: Add note for example serial port
Oleg Moiseenko [Thu, 26 Oct 2017 17:09:53 +0000 (20:09 +0300)]
code cleaning (#445)
Oleg Moiseenko [Thu, 26 Oct 2017 16:32:18 +0000 (19:32 +0300)]
small improvement in tests (test result in green or red) (#448)
Iceman [Thu, 26 Oct 2017 09:46:20 +0000 (11:46 +0200)]
Merge pull request #440 from merlokk/c3
improve appveyor.yml
Oleg Moiseenko [Wed, 25 Oct 2017 05:56:03 +0000 (08:56 +0300)]
identification fix for magic chinese cards (#444)
* fixed #411
Iceman [Tue, 24 Oct 2017 12:28:16 +0000 (14:28 +0200)]
Merge pull request #443 from doegox/flush
Flush stdout when waiting for /dev/ttyACM0
Philippe Teuwen [Tue, 24 Oct 2017 12:10:52 +0000 (14:10 +0200)]
Flush stdout when waiting for /dev/ttyACM0
pwpiwi [Tue, 24 Oct 2017 05:48:38 +0000 (07:48 +0200)]
fix hw status (and USB comm in general) (#434)
* don't ignore ReadLine() errors (Windows)
* lock CmdBuffer with Mutex
* refactor WaitForResponseTimeoutW
Iceman [Mon, 23 Oct 2017 13:05:07 +0000 (15:05 +0200)]
Merge pull request #438 from pwpiwi/fpga_14b
FPGA changes ISO14443B:
merlokk [Mon, 23 Oct 2017 10:43:46 +0000 (13:43 +0300)]
added write-host for tests
Michael Farrell [Mon, 23 Oct 2017 07:04:06 +0000 (18:04 +1100)]
Multiple USB-CDC changes (attempt 6) (#439)
- Fix reporting of string descriptors.
- Add note about ModemManager matching on the manufacturer string.
merlokk [Sun, 22 Oct 2017 19:20:44 +0000 (22:20 +0300)]
normally show powershell scripts
it needs to have no spaces at the end of lines and no `;`
merlokk [Sun, 22 Oct 2017 18:47:19 +0000 (21:47 +0300)]
added testing timeout 40 sec to avoid hang VM
pwpiwi [Thu, 7 Sep 2017 07:33:32 +0000 (09:33 +0200)]
FPGA changes ISO14443B:
* slightly increase reader field strength
* increase sensitivity when reading, allowing increased reading distance
pwpiwi [Fri, 20 Oct 2017 18:20:07 +0000 (20:20 +0200)]
small fix: make iso14a_set_timeout() external
Oleg Moiseenko [Fri, 20 Oct 2017 17:11:02 +0000 (20:11 +0300)]
added CI appveyor.com (#436)
pwpiwi [Fri, 20 Oct 2017 15:55:13 +0000 (17:55 +0200)]
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
Iceman [Fri, 20 Oct 2017 15:54:36 +0000 (17:54 +0200)]
Merge pull request #435 from ytisf/master
Fixing liblua issues
tisf [Fri, 20 Oct 2017 14:55:13 +0000 (21:55 +0700)]
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.
Oleg Moiseenko [Fri, 20 Oct 2017 04:49:53 +0000 (07:49 +0300)]
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
Oleg Moiseenko [Thu, 19 Oct 2017 10:23:09 +0000 (13:23 +0300)]
fix fpga_comress sending no-error messages to stderr (#430)
Iceman [Wed, 18 Oct 2017 20:08:07 +0000 (22:08 +0200)]
Merge pull request #427 from pwpiwi/usb_mods
Improve device side USB implementation.
Oleg Moiseenko [Wed, 18 Oct 2017 19:44:59 +0000 (22:44 +0300)]
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
pwpiwi [Tue, 17 Oct 2017 17:25:40 +0000 (19:25 +0200)]
Device side USB implementation:
* add some comments and #defines in usb_cdc.c
* use full FIFO size of 64 Bytes for device -> host transfers
Iceman [Mon, 16 Oct 2017 16:16:39 +0000 (18:16 +0200)]
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
Iceman [Mon, 16 Oct 2017 08:36:49 +0000 (10:36 +0200)]
Merge pull request #420 from merlokk/b_fix
small fix #416
merlokk [Mon, 16 Oct 2017 08:33:17 +0000 (11:33 +0300)]
small fix #416
Oleg Moiseenko [Sun, 15 Oct 2017 19:19:34 +0000 (22:19 +0300)]
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.
Iceman [Fri, 6 Oct 2017 00:36:06 +0000 (02:36 +0200)]
Merge pull request #407 from pwpiwi/no_rats
Don't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX, …)
pwpiwi [Thu, 5 Oct 2017 16:07:26 +0000 (18:07 +0200)]
fix LUA script errors
Oleg Moiseenko [Thu, 5 Oct 2017 11:37:51 +0000 (14:37 +0300)]
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
pwpiwi [Wed, 4 Oct 2017 16:25:34 +0000 (18:25 +0200)]
Adjust LUA scripts to new ISO14A_NO_RATS option
pwpiwi [Sun, 1 Oct 2017 15:52:10 +0000 (17:52 +0200)]
Don't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX, ...)
Iceman [Fri, 29 Sep 2017 10:02:10 +0000 (12:02 +0200)]
Merge pull request #405 from ZenSecurity/master
Added bus blaster (http://dangerousprototypes.com/docs/Bus_Blaster) c…
Iceman [Fri, 29 Sep 2017 10:01:54 +0000 (12:01 +0200)]
Merge pull request #402 from pwpiwi/env_flags
Don't ignore environment variables CFLAGS and LDFLAGS
Mikhail Yushkovskiy [Wed, 27 Sep 2017 20:37:46 +0000 (23:37 +0300)]
Added bus blaster (http://dangerousprototypes.com/docs/Bus_Blaster) configuration for AT91SAM7S512 support in openocd.
pwpiwi [Tue, 26 Sep 2017 16:15:19 +0000 (18:15 +0200)]
Don't ignore environment variables CFLAGS and LDFLAGS for tools as well
pwpiwi [Mon, 25 Sep 2017 16:31:10 +0000 (18:31 +0200)]
Don't ignore environment variables CFLAGS and LDFLAGS
* they are be set by some build environments to find include and lib dirs
Iceman [Tue, 26 Sep 2017 15:08:50 +0000 (17:08 +0200)]
Merge pull request #393 from pwpiwi/fix_getclocktime
Fix clock_gettime() for Apple OSX
Fl0-0 [Tue, 26 Sep 2017 14:36:05 +0000 (16:36 +0200)]
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]
marshmellow42 [Tue, 26 Sep 2017 11:38:24 +0000 (07:38 -0400)]
Merge pull request #400 from merlokk/master
fixed #395
merlokk [Tue, 26 Sep 2017 11:29:08 +0000 (14:29 +0300)]
fixed #395
Oleg Moiseenko [Fri, 22 Sep 2017 17:40:42 +0000 (20:40 +0300)]
reworking magic cheneese card wipe (#365)
Implement hf mf cwipe. Remove wipe parameter from hf mf csetuid.
pwpiwi [Wed, 20 Sep 2017 05:32:15 +0000 (07:32 +0200)]
Fix clock_gettime() for Apple OSX
(also fixes hf mf hardnested)
Iceman [Wed, 13 Sep 2017 17:02:05 +0000 (19:02 +0200)]
Merge pull request #392 from pwpiwi/expr_fix
Fix detection of AVX512 support for Apple clang compiler
pwpiwi [Mon, 11 Sep 2017 19:08:09 +0000 (21:08 +0200)]
Fix detection of AVX512 support for Apple clang compiler
marshmellow42 [Mon, 11 Sep 2017 17:18:32 +0000 (13:18 -0400)]
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.
marshmellow42 [Sun, 27 Aug 2017 10:10:28 +0000 (06:10 -0400)]
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.
uzlonewolf [Sun, 27 Aug 2017 10:09:39 +0000 (03:09 -0700)]
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
Fl0-0 [Sun, 27 Aug 2017 10:08:48 +0000 (12:08 +0200)]
Fix gcc version detection (from iceman1001 fork), fix issue #386 (#388)
iceman1001 [Sat, 26 Aug 2017 22:32:22 +0000 (00:32 +0200)]
fix: 'hf mf nested' - got an initialized bug from the monster merge
marshmellow42 [Tue, 22 Aug 2017 16:33:12 +0000 (12:33 -0400)]
helptext fixes (#384)
pwpiwi [Tue, 22 Aug 2017 08:04:47 +0000 (10:04 +0200)]
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)
marshmellow42 [Mon, 21 Aug 2017 19:29:56 +0000 (15:29 -0400)]
Merge pull request #356 from pwpiwi/low_frequencies
revert removal of quarter frequency support for hi_read_rx_xcorr.v
pwpiwi [Fri, 18 Aug 2017 05:50:03 +0000 (07:50 +0200)]
Fix compile issues for mfkey32 and mfkey64 after Pull Request #380
etmatrix [Thu, 17 Aug 2017 14:59:48 +0000 (16:59 +0200)]
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
pwpiwi [Wed, 16 Aug 2017 06:50:31 +0000 (08:50 +0200)]
Prevent using x86 SIMD compiler flags on aarch64 (ARM) architecture
marshmellow42 [Tue, 8 Aug 2017 19:08:59 +0000 (15:08 -0400)]
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.
pwpiwi [Thu, 27 Jul 2017 16:35:12 +0000 (18:35 +0200)]
FIX: 'lf hid sim' - it now prints the id correct ref https://github.com/Proxmark/proxmark3/issues/364
Iceman [Sat, 22 Jul 2017 11:38:30 +0000 (13:38 +0200)]
Merge pull request #362 from merlokk/master
small fix formatmifare.lua
merlokk [Fri, 21 Jul 2017 16:36:49 +0000 (19:36 +0300)]
small fix formatmifare.lua
Iceman [Tue, 18 Jul 2017 07:06:49 +0000 (09:06 +0200)]
Merge pull request #361 from marshmellow42/master
fix lf get sample bits vs bytes bug
marshmellow42 [Mon, 17 Jul 2017 21:40:10 +0000 (17:40 -0400)]
fix lf get sample bits vs bytes bug
marshmellow42 [Fri, 14 Jul 2017 16:27:41 +0000 (12:27 -0400)]
Merge pull request #355 from pwpiwi/io_fix
fix lf io clone (issue #331):
marshmellow42 [Fri, 14 Jul 2017 16:24:24 +0000 (12:24 -0400)]
Merge pull request #358 from Fl0-0/Fix_missing_reference_PAC_Stanley
Fix missing reference for PAC/Stanley
Fl0-0 [Fri, 14 Jul 2017 15:45:09 +0000 (17:45 +0200)]
Fix missing reference for PAC/Stanley
marshmellow42 [Fri, 14 Jul 2017 12:04:46 +0000 (08:04 -0400)]
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
pwpiwi [Thu, 13 Jul 2017 16:12:53 +0000 (18:12 +0200)]
fix lf io clone (issue #331):
- remove confusing message about simulation
- add h (help) parameter and usage text