]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
6 years agoDevice side USB implementation: 427/head
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

6 years agowrong define used (#421)
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

6 years agoMerge pull request #420 from merlokk/b_fix
Iceman [Mon, 16 Oct 2017 08:36:49 +0000 (10:36 +0200)]
Merge pull request #420 from merlokk/b_fix

small fix #416

6 years agosmall fix #416 420/head
merlokk [Mon, 16 Oct 2017 08:33:17 +0000 (11:33 +0300)]
small fix #416

6 years agoCheck keys in hf mf nested and hf mf chk (#414)
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.

6 years agoMerge pull request #407 from pwpiwi/no_rats
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, …)

6 years agofix LUA script errors 407/head
pwpiwi [Thu, 5 Oct 2017 16:07:26 +0000 (18:07 +0200)]
fix LUA script errors

6 years agohf mf nested add some functionality (#403)
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

6 years agoAdjust LUA scripts to new ISO14A_NO_RATS option
pwpiwi [Wed, 4 Oct 2017 16:25:34 +0000 (18:25 +0200)]
Adjust LUA scripts to new ISO14A_NO_RATS option

6 years agoDon't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX...
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, ...)

6 years agoMerge pull request #405 from ZenSecurity/master
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…

6 years agoMerge pull request #402 from pwpiwi/env_flags
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

6 years agoAdded bus blaster (http://dangerousprototypes.com/docs/Bus_Blaster) configuration... 405/head
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.

6 years agoDon't ignore environment variables CFLAGS and LDFLAGS for tools as well 402/head
pwpiwi [Tue, 26 Sep 2017 16:15:19 +0000 (18:15 +0200)]
Don't ignore environment variables CFLAGS and LDFLAGS for tools as well

6 years agoDon't ignore environment variables CFLAGS and LDFLAGS
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

6 years agoMerge pull request #393 from pwpiwi/fix_getclocktime
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

6 years agoFix typo and gcc-7 warnings (#401)
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]

6 years agoMerge pull request #400 from merlokk/master
marshmellow42 [Tue, 26 Sep 2017 11:38:24 +0000 (07:38 -0400)]
Merge pull request #400 from merlokk/master

fixed #395

6 years agofixed #395 400/head
merlokk [Tue, 26 Sep 2017 11:29:08 +0000 (14:29 +0300)]
fixed #395

6 years agoreworking magic cheneese card wipe (#365)
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.

6 years agoFix clock_gettime() for Apple OSX 393/head
pwpiwi [Wed, 20 Sep 2017 05:32:15 +0000 (07:32 +0200)]
Fix clock_gettime() for Apple OSX
(also fixes hf mf hardnested)

6 years agoMerge pull request #392 from pwpiwi/expr_fix
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

6 years agoFix detection of AVX512 support for Apple clang compiler 392/head
pwpiwi [Mon, 11 Sep 2017 19:08:09 +0000 (21:08 +0200)]
Fix detection of AVX512 support for Apple clang compiler

6 years agofix lf sim fpga download overwrites sim buffer (#391)
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.

6 years agoIndala fixes - set accurate preamble and start of.. (#385)
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.

6 years agoDon't try to display the GUI when running in textmode (#387)
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

6 years agoFix gcc version detection (from iceman1001 fork), fix issue #386 (#388)
Fl0-0 [Sun, 27 Aug 2017 10:08:48 +0000 (12:08 +0200)]
Fix gcc version detection (from iceman1001 fork), fix issue #386 (#388)

6 years agofix: 'hf mf nested' - got an initialized bug from the monster merge
iceman1001 [Sat, 26 Aug 2017 22:32:22 +0000 (00:32 +0200)]
fix:  'hf mf nested' - got an initialized bug from the monster merge

6 years agohelptext fixes (#384)
marshmellow42 [Tue, 22 Aug 2017 16:33:12 +0000 (12:33 -0400)]
helptext fixes (#384)

6 years agoUse PolarSSL DES implementation (GPL 2 or later) for both client and firmware (#378)
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)

6 years agoMerge pull request #356 from pwpiwi/low_frequencies
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

6 years agoFix compile issues for mfkey32 and mfkey64 after Pull Request #380
pwpiwi [Fri, 18 Aug 2017 05:50:03 +0000 (07:50 +0200)]
Fix compile issues for mfkey32 and mfkey64 after Pull Request #380

6 years agoFixes 2 bugs in mifare simulate (#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

6 years agoPrevent using x86 SIMD compiler flags on aarch64 (ARM) architecture
pwpiwi [Wed, 16 Aug 2017 06:50:31 +0000 (08:50 +0200)]
Prevent using x86 SIMD compiler flags on aarch64 (ARM) architecture

6 years agoadjust lf simulation - fix one bug + attempt... (#369)
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.

6 years agoFIX: 'lf hid sim' - it now prints the id correct ref https://github.com/Proxmark...
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

6 years agoMerge pull request #362 from merlokk/master
Iceman [Sat, 22 Jul 2017 11:38:30 +0000 (13:38 +0200)]
Merge pull request #362 from merlokk/master

small fix formatmifare.lua

6 years agosmall fix formatmifare.lua 362/head
merlokk [Fri, 21 Jul 2017 16:36:49 +0000 (19:36 +0300)]
small fix formatmifare.lua

6 years agoMerge pull request #361 from marshmellow42/master
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

6 years agofix lf get sample bits vs bytes bug 361/head
marshmellow42 [Mon, 17 Jul 2017 21:40:10 +0000 (17:40 -0400)]
fix lf get sample bits vs bytes bug

6 years agoMerge pull request #355 from pwpiwi/io_fix
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):

6 years agoMerge pull request #358 from Fl0-0/Fix_missing_reference_PAC_Stanley
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

6 years agoFix missing reference for PAC/Stanley 358/head
Fl0-0 [Fri, 14 Jul 2017 15:45:09 +0000 (17:45 +0200)]
Fix missing reference for PAC/Stanley

6 years agoadd lf PAC/Stanley tag read (#354)
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

6 years agofix lf io clone (issue #331): 355/head
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

6 years agorevert removal of quarter frequency support for hi_read_rx_xcorr.v 356/head
pwpiwi [Tue, 11 Jul 2017 06:50:27 +0000 (08:50 +0200)]
revert removal of quarter frequency support for hi_read_rx_xcorr.v

6 years agoImprove 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compati...
Fl0-0 [Wed, 12 Jul 2017 13:58:32 +0000 (15:58 +0200)]
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

6 years agoadd data fsktonrz fsk cleaning util (#352)
marshmellow42 [Wed, 12 Jul 2017 05:31:42 +0000 (01:31 -0400)]
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.

6 years agoMerge pull request #351 from Fl0-0/CmdEM410xBrute_mingw_fix
Iceman [Thu, 6 Jul 2017 07:25:03 +0000 (09:25 +0200)]
Merge pull request #351 from Fl0-0/CmdEM410xBrute_mingw_fix

Fix CmdEM410xBrute string format warning

6 years agoFix CmdEM410xBrute string format warning 351/head
Fl0-0 [Wed, 5 Jul 2017 19:16:15 +0000 (21:16 +0200)]
Fix CmdEM410xBrute string format warning

6 years agoRefactoring uart interface (#341)
Michael Farrell [Wed, 5 Jul 2017 18:22:02 +0000 (04:22 +1000)]
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.

6 years agohitag2 write (#310)
Henrik Johansson [Wed, 5 Jul 2017 18:16:54 +0000 (20:16 +0200)]
hitag2 write (#310)

Usage is similar to hitagS write: lf hitag write 24 KEY pagenumber 32bitvalue
* added changlelog entry

6 years agofix some iclass reader bugs (#350)
marshmellow42 [Wed, 5 Jul 2017 16:11:48 +0000 (12:11 -0400)]
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.

6 years agoMerge pull request #347 from Fl0-0/master
Iceman [Mon, 3 Jul 2017 07:34:48 +0000 (09:34 +0200)]
Merge pull request #347 from Fl0-0/master

LF EM410x bruteforce typo errors correction

6 years agoFix typo in helps 347/head
Fl0-0 [Mon, 3 Jul 2017 07:16:28 +0000 (09:16 +0200)]
Fix typo in helps

6 years agomissing a c in the helptext sample
Fl0-0 [Mon, 3 Jul 2017 06:56:36 +0000 (08:56 +0200)]
missing a c in the helptext sample

6 years agoMerge pull request #343 from Fl0-0/master
Iceman [Mon, 3 Jul 2017 06:56:19 +0000 (08:56 +0200)]
Merge pull request #343 from Fl0-0/master

LF EM410x bruteforcing function by simulating EM410x tags (1 UID/s)

6 years agoUpdate changelog 343/head
Fl0-0 [Mon, 3 Jul 2017 06:04:24 +0000 (08:04 +0200)]
Update changelog

6 years agoMerge remote-tracking branch 'upstream/master'
Fl0-0 [Sun, 2 Jul 2017 15:54:35 +0000 (17:54 +0200)]
Merge remote-tracking branch 'upstream/master'

6 years agoIdentation fix
Fl0-0 [Sat, 1 Jul 2017 20:36:49 +0000 (22:36 +0200)]
Identation fix

6 years agoIdentation fix
Fl0-0 [Sat, 1 Jul 2017 20:35:49 +0000 (22:35 +0200)]
Identation fix

6 years agoIdentation
Fl0-0 [Sat, 1 Jul 2017 20:32:49 +0000 (22:32 +0200)]
Identation

6 years agoUse param_get32ex() and add c for clock parameter
Fl0-0 [Sat, 1 Jul 2017 20:31:06 +0000 (22:31 +0200)]
Use param_get32ex() and add c for clock parameter

6 years agoMerge pull request #345 from pwpiwi/hardnested_compress
Iceman [Sat, 1 Jul 2017 19:22:55 +0000 (21:22 +0200)]
Merge pull request #345 from pwpiwi/hardnested_compress

hardnested: dramatically reduce required disk space for tables

6 years agoFix typo error
Fl0-0 [Sat, 1 Jul 2017 17:49:02 +0000 (19:49 +0200)]
Fix typo error

6 years agoEM410x bruteforcing changes: Load the whole file at once, pause delay as parameter...
root [Sat, 1 Jul 2017 15:53:06 +0000 (17:53 +0200)]
EM410x bruteforcing changes: Load the whole file at once, pause  delay as parameter, stop the execution on key press and EM410x conversion to signal function.

6 years agoMerge remote-tracking branch 'upstream/master'
root [Sat, 1 Jul 2017 11:57:30 +0000 (13:57 +0200)]
Merge remote-tracking branch 'upstream/master'

6 years agoMerge pull request #344 from pwpiwi/RasPi_fix
Iceman [Sat, 1 Jul 2017 06:08:45 +0000 (08:08 +0200)]
Merge pull request #344 from pwpiwi/RasPi_fix

Fix issue #342

6 years agoFix issue #342 344/head
pwpiwi [Fri, 30 Jun 2017 18:27:38 +0000 (20:27 +0200)]
Fix issue #342

6 years agoIndentation fix
Fl0-0 [Fri, 30 Jun 2017 12:50:32 +0000 (14:50 +0200)]
Indentation fix

6 years agoAdd EM410x bruteforcing error checks
Fl0-0 [Fri, 30 Jun 2017 08:00:03 +0000 (10:00 +0200)]
Add EM410x bruteforcing error checks

6 years agoAdd EM410x bruteforcing function by simulating EM410x tags (1 UID/s)
Fl0-0 [Fri, 30 Jun 2017 07:17:31 +0000 (09:17 +0200)]
Add EM410x bruteforcing function by simulating EM410x tags (1 UID/s)

6 years agohardnested: reduce disk space for tables (by > 700MBytes) and other minor changes 345/head
pwpiwi [Tue, 27 Jun 2017 05:56:43 +0000 (07:56 +0200)]
hardnested: reduce disk space for tables (by > 700MBytes) and other minor changes
- compress tables
- minor changes to progress reporting
- free memory on aborts (@iceman1001)

6 years agoMerge pull request #333 from micolous/osx-libedit
marshmellow42 [Fri, 30 Jun 2017 04:22:55 +0000 (00:22 -0400)]
Merge pull request #333 from micolous/osx-libedit

OSX: Disable GNU readline-specific hack when libedit is used (fixes #110)

6 years agoUpdate cmdhf14a.c
Iceman [Mon, 26 Jun 2017 19:58:03 +0000 (21:58 +0200)]
Update cmdhf14a.c

need include to detection function

6 years agoUpdate hfsnoop.c (#338)
Iceman [Mon, 26 Jun 2017 06:37:32 +0000 (08:37 +0200)]
Update hfsnoop.c (#338)

fix:  missed a include for usb_poll_validate_length

6 years agoMerge pull request #337 from Proxmark/iceman1001-patch-4
pwpiwi [Mon, 26 Jun 2017 05:50:57 +0000 (07:50 +0200)]
Merge pull request #337 from Proxmark/iceman1001-patch-4

Iceman1001 patch 4

6 years agoUpdate aes.c (#336)
Iceman [Sun, 25 Jun 2017 22:52:09 +0000 (00:52 +0200)]
Update aes.c (#336)

FIX:  coverity scan - improper use of sizeof

6 years agoUpdate hfsnoop.c iceman1001-patch-4 337/head
Iceman [Sun, 25 Jun 2017 17:39:45 +0000 (19:39 +0200)]
Update hfsnoop.c

chg:  enabled snooping function to break on receiving a usbpackage.

6 years agoUpdate BigBuf.h
Iceman [Sun, 25 Jun 2017 17:35:59 +0000 (19:35 +0200)]
Update BigBuf.h

added the header definition

6 years agoUpdate BigBuf.c
Iceman [Sun, 25 Jun 2017 17:35:03 +0000 (19:35 +0200)]
Update BigBuf.c

chg:  change from defines to booleans.
add: bigbuf_clear_em(),  empties the reserved emulator part only

6 years agoUpdate fpgaloader.c
Iceman [Sun, 25 Jun 2017 17:30:07 +0000 (19:30 +0200)]
Update fpgaloader.c

CHG:  just making sure the bigbuff is cleared after the zlib played.  So we don't get the random noice that ppl are posting thinking they got a signal.

6 years agoOSX: delete another reference to readline 333/head
Michael Farrell [Sun, 25 Jun 2017 11:43:39 +0000 (21:43 +1000)]
OSX: delete another reference to readline

6 years agoOSX: Remove references to GNU readline as it will be no longer required
Michael Farrell [Sun, 25 Jun 2017 02:38:38 +0000 (12:38 +1000)]
OSX: Remove references to GNU readline as it will be no longer required

6 years agoOSX: Disable GNU readline-specific hack when libedit is used (fixes #110)
Michael Farrell [Sun, 25 Jun 2017 02:26:33 +0000 (12:26 +1000)]
OSX: Disable GNU readline-specific hack when libedit is used (fixes #110)

6 years agoUpdate cmdhfmfu.c (#332)
Iceman [Sat, 24 Jun 2017 09:54:42 +0000 (11:54 +0200)]
Update cmdhfmfu.c (#332)

* Update cmdhfmfu.c

CHG:
   removed sniffed keys,  amiibo pwd gen algo is known.
   'hf mfu rdbl' - header output aligned
  'hf mfu dump' - header output aligned

* Update cmdhfmfu.c

chg: adjusted KEYS_PWD_COUNT accordingly

6 years agoMerge pull request #330 from marshmellow42/master
Iceman [Fri, 23 Jun 2017 18:25:51 +0000 (20:25 +0200)]
Merge pull request #330 from marshmellow42/master

bug fix for hf iclass reader and iclass detection

6 years agobug fix for hf iclass reader and iclass detection 330/head
marshmellow42 [Fri, 23 Jun 2017 17:50:25 +0000 (13:50 -0400)]
bug fix for hf iclass reader and iclass detection

memory locations in code are now accurate and the CC output is not
corrupted by the config's crc.

also the looping and flags for what to read are now correctly
implemented in the code.

6 years agoMerge pull request #329 from marshmellow42/master
Iceman [Wed, 21 Jun 2017 23:13:07 +0000 (01:13 +0200)]
Merge pull request #329 from marshmellow42/master

iclass - updates

6 years agoiclass - updates 329/head
marshmellow42 [Wed, 21 Jun 2017 20:51:22 +0000 (16:51 -0400)]
iclass - updates

clean up output
allow readblock without authenticating (can read blocks 0, 1, 2, 5
without authenticating.)
add Application Issuer Area to reader output and use it to attempt to
identify legacy vs NOT legacy.

6 years agosome coverity fixes plus fix fdx help (#328)
marshmellow42 [Tue, 20 Jun 2017 22:25:08 +0000 (18:25 -0400)]
some coverity fixes plus fix fdx help (#328)

* coverity fixes

cmdhflegic- indications are the i in calls to data_buf[i] could = 1052
and overflow the array.
cmdhfmfhard - +1 to add space for string null terminator - should we add
the 0 terminator value too?
reveng.c - memory leak
util.c - fix potential overflow of array buf[]
util_posix.c - possible integer overflow

* fix help errors

* fix sprint_hex_ascii

again
and this function is not even used anywhere... yet...

6 years agoMerge pull request #322 from Proxmark/iceman1001-patch-2
marshmellow42 [Mon, 19 Jun 2017 13:01:44 +0000 (09:01 -0400)]
Merge pull request #322 from Proxmark/iceman1001-patch-2

Update 77-mm-usb-device-blacklist.rules

6 years agoMerge pull request #321 from Proxmark/iceman1001-patch-1
marshmellow42 [Fri, 16 Jun 2017 18:46:50 +0000 (14:46 -0400)]
Merge pull request #321 from Proxmark/iceman1001-patch-1

BUG: 'hf mf mifare'

6 years agoUpdate 77-mm-usb-device-blacklist.rules 322/head
Iceman [Fri, 16 Jun 2017 17:48:18 +0000 (19:48 +0200)]
Update 77-mm-usb-device-blacklist.rules

fix: updated the blacklist rules file with the updated usb_cdc vid/pid values

6 years agoBUG: 'hf mf mifare' 321/head
Iceman [Fri, 16 Jun 2017 12:43:53 +0000 (14:43 +0200)]
BUG: 'hf mf mifare'

BUG: 'hf mf mifare' ,  wrongly identify success when faulty key is found
https://github.com/Proxmark/proxmark3/issues/320

6 years agoMerge pull request #319 from Proxmark/iceman1001-patch-2
marshmellow42 [Tue, 13 Jun 2017 21:23:24 +0000 (17:23 -0400)]
Merge pull request #319 from Proxmark/iceman1001-patch-2

bug:  hf mf chk - wrong size

6 years agoMerge pull request #317 from Proxmark/iceman1001-patch-1
marshmellow42 [Tue, 13 Jun 2017 21:22:44 +0000 (17:22 -0400)]
Merge pull request #317 from Proxmark/iceman1001-patch-1

bug;  Check keys params

6 years agobug: hf mf chk - wrong size 319/head
Iceman [Mon, 12 Jun 2017 13:07:00 +0000 (15:07 +0200)]
bug:  hf mf chk - wrong size

bug:  'hf mf chk' - size of keycounter variable is too small for dictionary files larger than 256rows.

6 years agobug; Check keys params 317/head
Iceman [Mon, 12 Jun 2017 10:21:01 +0000 (12:21 +0200)]
bug;  Check keys params

CMD_MIFARE_CHKKEYS command has a different arg1, arg2 meaning nowdays.
Arg0  =  keytype << 8 | blockno
arg1  = clear trace

In lua its name arg1, probably with lua's startindex is 1...

6 years agoMerge pull request #315 from marshmellow42/master v3.0.1
Iceman [Fri, 9 Jun 2017 13:50:55 +0000 (15:50 +0200)]
Merge pull request #315 from marshmellow42/master

fix compile issues on OS X 10.11

Impressum, Datenschutz