proxmark3-svn
3 years agoUpdate CHANGELOG for 3.1.0 release v3.1.0
pwpiwi [Wed, 10 Oct 2018 06:13:40 +0000 (08:13 +0200)]
Update CHANGELOG for 3.1.0 release

3 years agoAdded loading parameters from json to several emv commands (#686)
Oleg Moiseenko [Mon, 8 Oct 2018 05:48:37 +0000 (08:48 +0300)]
Added loading parameters from json to several emv commands  (#686)

* added loading params from GPO
* `hf emv pdol` added help and warning
* started `hf emv ac`
* dol calculation implemented in genac and intauth
* help fix

3 years agoosx: fix annoying focus behaviour (#689)
AntiCat [Mon, 8 Oct 2018 05:20:21 +0000 (07:20 +0200)]
osx: fix annoying focus behaviour (#689)

OS X has a global menu bar and a per app dock icon. Therefore, all
GUI applications launched from a terminal will become focused - even
if they don’t show any windows. Thereby the terminal loses focus.

Since is it very annoying to re-focus the terminal after each proxmark
client launch, this change makes the client unfocusable during launch
and restores the regular behaviour when a window is created.

3 years agoosx: disable app-nap during serial comm (#687)
AntiCat [Mon, 8 Oct 2018 05:15:29 +0000 (07:15 +0200)]
osx: disable app-nap during serial comm (#687)

Apple introduced app-nap with OS X 10.10. This feature
saves power by throttling apps running in background.
However, it also less accurate timers in systemcalls. In
our case a 30ms select timeout would take up to 10s.

This patch uses an API also added with 10.10 to disable
app-nap as long as the serial port is polled.

3 years agostart fixing hf 15: (#684)
pwpiwi [Sun, 7 Oct 2018 15:32:03 +0000 (17:32 +0200)]
start fixing hf 15: (#684)

* implement a real time Decoder for tag responses (will be required for sniffing)
* switch off field after each command (protect rdv40)
* correctly signal field status with LED D

3 years agoFix: ControlWidget placement (#690)
AntiCat [Sun, 7 Oct 2018 15:30:47 +0000 (17:30 +0200)]
Fix: ControlWidget placement (#690)

* ui: code cleanup
* ui: move control widget below plot

3 years agoAdd another #ifdef for the __BIONIC__ fix (the effect of setting p_thread to 0 is...
pwpiwi [Sat, 6 Oct 2018 15:48:43 +0000 (17:48 +0200)]
Add another #ifdef for the __BIONIC__ fix (the effect of setting p_thread to 0 is undefined for other libs)

3 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Sat, 6 Oct 2018 15:35:40 +0000 (17:35 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

3 years agoFIX: crash on Bionic libc if CloseProxmark is called twice. (#672)
Michael Farrell [Sat, 6 Oct 2018 15:33:44 +0000 (01:33 +1000)]
FIX: crash on Bionic libc if CloseProxmark is called twice. (#672)

In Android O and later, if an invalid pthread_t is passed to pthread_join,
it calls fatal().

https://github.com/aosp-mirror/platform_bionic/blob/ed16b344e75f422fb36fbfd91fb30de339475880/libc/bionic/pthread_internal.cpp#L116-L128

This patch addresses it by:

1. Always memset(0) on USB_communications_thread at the end of
   CloseProxmark.

2. On Bionic, only call pthread_join on USB_communications_thread if it is
   not equal to 0.

3 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Sat, 6 Oct 2018 07:06:13 +0000 (09:06 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

3 years agomodify argtable parser to parse ints with spaces (#683)
Oleg Moiseenko [Mon, 1 Oct 2018 18:12:14 +0000 (21:12 +0300)]
modify argtable parser to parse ints with spaces (#683)

* modify argtable parser to parse ints with spaces
* added arg_strx1 and arg_strx0 for x str arguments in one
* added option to clue data in arg parser
* add new argtable logic to emv commands and small fix
* small fix in GPO help
* small GPO fix

3 years agoAdded to `hf emv` commands: `gpo`, `readrec`, `genac`, `challenge`, `intauth` (#671)
Oleg Moiseenko [Fri, 28 Sep 2018 16:03:21 +0000 (19:03 +0300)]
Added to `hf emv` commands: `gpo`, `readrec`, `genac`, `challenge`, `intauth` (#671)

* move `hf emv search` to argtable
* `hf emv select`
* delete old help
* `hf emv pse` and sketch for the other commands
* `hf emv gpo`
* `hf emv readrec`
* `hf emv challenge` works
* added `intauth` and `genac` commands.
* added CDA transaction to `hf emv genac`
* add terminal decision to `genac`
* added changelog

3 years agoMerge branch 'emv_argtable' of https://github.com/merlokk/proxmark3
pwpiwi [Fri, 28 Sep 2018 15:59:14 +0000 (17:59 +0200)]
Merge branch 'emv_argtable' of https://github.com/merlokk/proxmark3

3 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Mon, 24 Sep 2018 11:04:21 +0000 (13:04 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

3 years agoFix: accidentially deleted line in fpgaloader.c
pwpiwi [Mon, 24 Sep 2018 11:03:13 +0000 (13:03 +0200)]
Fix: accidentially deleted line in fpgaloader.c

3 years agoFIX: APDUCodeTable has more items than 100 (#682)
Oleg Moiseenko [Mon, 24 Sep 2018 10:48:07 +0000 (13:48 +0300)]
FIX: APDUCodeTable has more items than 100 (#682)

https://github.com/RfidResearchGroup/proxmark3/commit/4fa0835d5f7823b9b850be7c7162a98f9a3973a2

3 years agoMerge branch 'master' into emv_argtable 671/head
Oleg Moiseenko [Mon, 24 Sep 2018 10:27:30 +0000 (13:27 +0300)]
Merge branch 'master' into emv_argtable

3 years agoJansson gcc8 fix (#679)
Fl0-0 [Sat, 22 Sep 2018 15:51:13 +0000 (17:51 +0200)]
Jansson gcc8 fix (#679)

* Fix error in error.c
* Fix error in load.c

3 years agoRDV40 compatibility fixes (#678)
pwpiwi [Fri, 21 Sep 2018 06:27:35 +0000 (08:27 +0200)]
RDV40 compatibility fixes (#678)

* detect and use RDV40 higher voltage ADC channel for hw tune, hf tune, hw detectreader
* fix mode switching in hw detectreader
* detect Smartcard Slot in hw version
* i2c changes from https://github.com/RfidResearchGroup/proxmark3
* some formatting in proxmark3.h

3 years agoMerge pull request #658 from grauerfuchs/master
marshmellow42 [Wed, 19 Sep 2018 02:23:47 +0000 (22:23 -0400)]
Merge pull request #658 from grauerfuchs/master

rework of 'lf hid' commands for better card format handling

3 years agoMerge branch 'master' into master 658/head
marshmellow42 [Wed, 19 Sep 2018 02:12:11 +0000 (22:12 -0400)]
Merge branch 'master' into master

3 years agoadded EMV tag #9F6E (#676)
Oleg Moiseenko [Tue, 18 Sep 2018 16:52:41 +0000 (19:52 +0300)]
added EMV tag #9F6E (#676)

3 years ago`hf emv exec` works with argtable
merlokk [Tue, 18 Sep 2018 16:06:59 +0000 (19:06 +0300)]
`hf emv exec` works with argtable

3 years agodelete unused procedure after merge
merlokk [Tue, 18 Sep 2018 15:36:03 +0000 (18:36 +0300)]
delete unused procedure after merge

3 years agoMerge branch 'master' into emv_argtable
Oleg Moiseenko [Tue, 18 Sep 2018 15:29:59 +0000 (18:29 +0300)]
Merge branch 'master' into emv_argtable

3 years agoAdded loading EMV transaction parameters from json file (#659)
Oleg Moiseenko [Tue, 18 Sep 2018 05:15:34 +0000 (08:15 +0300)]
Added loading EMV transaction parameters from json file (#659)

* added default params file
* added jansson
* added test function.
* added tlv tree to function
* add params from json works
* added to `hf emv exec`: load params from json and some refactoring
* added `scan` command

3 years agoRemove unused functions le32toh, le24toh, hextobinstring, binarraytobinstring, print_...
Michael Farrell [Mon, 17 Sep 2018 06:35:45 +0000 (16:35 +1000)]
Remove unused functions le32toh, le24toh, hextobinstring, binarraytobinstring, print_hex, print_hex_break, sprint_hex_ascii, sprint_ascii, SwapEndian64ex (#667)

* Remove unused method le32toh.
* Delete unused function le24toh
* Remove unused functions hextobinstring, binarraytobinstring
* Remove unused functions print_hex, print_hex_break
* Delete unused functions sprint_hex_ascii, sprint_ascii
* Remove unused function SwapEndian64ex

3 years agoUpdate changelog and fix build error (#674)
AntiCat [Mon, 17 Sep 2018 05:56:53 +0000 (07:56 +0200)]
Update changelog and fix build error  (#674)

* Update CHANGELOG.md

3 years agofpgaloader: fix function accordingly to #669 (#673)
uhei [Mon, 17 Sep 2018 05:55:51 +0000 (07:55 +0200)]
fpgaloader: fix function accordingly to #669 (#673)

FpgaSetupSscDma uses uint16_t and not int with #669

3 years ago rework iso14443b device functions including FPGA I/Q signal transfer (#669)
pwpiwi [Sat, 15 Sep 2018 22:53:28 +0000 (00:53 +0200)]
 rework iso14443b device functions including FPGA I/Q signal transfer (#669)

* rework iso14443b device functions
* hf_read_rx_xcorr.v: transfer i/q pair in one 16bit frame
* hi_read_tx.v: invert ssp_dout. When nothing is transferred (ssp_dout=0), this results in no modulation (carrier on)
* adjust arm sources accordingly
* iso14443b.c: switch off carrier after hf 14b sri512read and hf 14b srix4kread
* iso14443b.c: fix DMA circular buffer handling

3 years agoAdding new Kastle 32-bit format from @xilni
grauerfuchs [Fri, 14 Sep 2018 10:32:29 +0000 (06:32 -0400)]
Adding new Kastle 32-bit format from @xilni

As approved by @0xFFFF on RfidResearchGroup/proxmark3 and provided by @xilni, this commit adds the format into the official repo as well. As I don't have any of the cards available for testing, I have been unable to personally verify the format encodes/decodes as intended.

3 years agoMerge branch 'master' into master
grauerfuchs [Fri, 14 Sep 2018 01:30:24 +0000 (21:30 -0400)]
Merge branch 'master' into master

3 years agoChanges requested by @marshmellow42
grauerfuchs [Fri, 14 Sep 2018 01:05:11 +0000 (21:05 -0400)]
Changes requested by @marshmellow42

Added CHANGELOG details for new lf hid commands
Restored basic ARM-side decoding of 26-bit and 35-bit cards

3 years agoadded changelog
merlokk [Thu, 13 Sep 2018 17:03:10 +0000 (20:03 +0300)]
added changelog

3 years agosmall fixes in helps
merlokk [Thu, 13 Sep 2018 16:58:26 +0000 (19:58 +0300)]
small fixes in helps

3 years agoadd terminal decision to `genac` and small fixes
merlokk [Thu, 13 Sep 2018 16:53:14 +0000 (19:53 +0300)]
add terminal decision to `genac` and small fixes

3 years agoadded CDA transaction to `hf emv genac`
merlokk [Thu, 13 Sep 2018 15:44:20 +0000 (18:44 +0300)]
added CDA transaction to `hf emv genac`

3 years agoadded `intauth` and `genac` commands. works.
merlokk [Thu, 13 Sep 2018 15:38:03 +0000 (18:38 +0300)]
added `intauth` and `genac` commands. works.

3 years agoCorrection to Samyrun offline mode
grauerfuchs [Thu, 13 Sep 2018 10:30:26 +0000 (06:30 -0400)]
Correction to Samyrun offline mode

update to Samyrun offline mode to support changes to HID ARM-side commands

This code has not yet been tested

3 years agosmall fix
merlokk [Wed, 12 Sep 2018 17:22:24 +0000 (20:22 +0300)]
small fix

3 years ago`hf emv challenge` works
merlokk [Wed, 12 Sep 2018 17:20:27 +0000 (20:20 +0300)]
`hf emv challenge` works

3 years ago`hf emv readrec` works and some changes in help
merlokk [Wed, 12 Sep 2018 17:08:16 +0000 (20:08 +0300)]
`hf emv readrec` works and some changes in help

3 years ago`hf emv gpo` works
merlokk [Wed, 12 Sep 2018 16:51:20 +0000 (19:51 +0300)]
`hf emv gpo` works

3 years agoadded new functions to `hf emv`
merlokk [Tue, 11 Sep 2018 14:02:22 +0000 (17:02 +0300)]
added new functions to `hf emv`

3 years ago`hf emv pse` and sketch for the other commands
merlokk [Tue, 11 Sep 2018 13:11:58 +0000 (16:11 +0300)]
`hf emv pse` and sketch for the other commands

3 years agodelete old help
merlokk [Tue, 11 Sep 2018 11:58:15 +0000 (14:58 +0300)]
delete old help

3 years ago`hf emv select` some refactoring
merlokk [Tue, 11 Sep 2018 11:56:33 +0000 (14:56 +0300)]
`hf emv select` some refactoring

3 years ago`hf emv select`
merlokk [Tue, 11 Sep 2018 11:49:50 +0000 (14:49 +0300)]
`hf emv select`

3 years agomove `hf emv search` to argtable
merlokk [Tue, 11 Sep 2018 09:21:29 +0000 (12:21 +0300)]
move `hf emv search` to argtable

3 years agoAllow clean Legic simulation exit without button press (#668)
wllm-rbnt [Mon, 10 Sep 2018 16:19:31 +0000 (18:19 +0200)]
Allow clean Legic simulation exit without button press (#668)

3 years agoLegic Tag Simulator (#666)
AntiCat [Sun, 9 Sep 2018 14:40:20 +0000 (16:40 +0200)]
Legic Tag Simulator (#666)

* FPGA Hi-Simulate: Formatted code
* FPGA Hi-Simulate: Fixed documantation
* FPGA Hi-Simulate: Freed up 4 LUTs
* FPGA Hi-Simulate: Added 212kHz SSP-Clock option
* Legic: Moved card simulator into separate file & cleaned interface.
Reader and card simulation have almost no common code. Moreover the sim
uses an SSP Clock at 212kHz for all timings to prevent any drifting from
the PRNG. This clock speed is not available in reader simulation mode (SSP
runs at up to 3.4MHz, and changes speed between TX and RX). For these
reasons having the code in separate files makes it significantly cleaner.
* Legic: Implemented RX and TX for card simulation
* Legic: Implemented setup phase for card simulation
* Legic: Implemented read command for card simulation
* Legic: Implemented write command for card simulation

3 years agoimplement argtable in hf 14a apdu (#490)
Oleg Moiseenko [Thu, 6 Sep 2018 05:48:54 +0000 (08:48 +0300)]
implement argtable in hf 14a apdu (#490)

* added `hf 14a reader` to source and added functionality to exec empty commands
* added `hf 14a raw`
* added samples to command's help
* added some help
* added changelog
* update to new argtable3 --- https://github.com/argtable/argtable3
* changed included getopt to `https://github.com/freebsd/freebsd/blob/master/include/getopt.h` (getopt from freebsd with simplified BSD license)

3 years agoupdate travis config (#662)
Oleg Moiseenko [Thu, 6 Sep 2018 05:38:38 +0000 (08:38 +0300)]
update travis config (#662)

3 years agolf hid improvements - encoding and long tag simulation
grauerfuchs [Fri, 31 Aug 2018 01:01:21 +0000 (21:01 -0400)]
lf hid improvements - encoding and long tag simulation
**DEVICE FIRMWARE UPDATE**
The code changes needed to support long tag emulation required an update to the device firmware. As of this patch, devices running older firmware will not be able to read or emulate HID tags until the firmware is updated. Additionally, devices with the firmware from this update or newer will not properly read or encode HID tags with a prior version client.

The 'lf hid encode' command has been further refined, and is now entirely parameterized to support use of fields other than facility code and card number. The client help data has been updated to show the correct syntax.

3 years agolf hid: Added encode/decode support for Issue Level
grauerfuchs [Tue, 28 Aug 2018 17:34:21 +0000 (13:34 -0400)]
lf hid: Added encode/decode support for Issue Level

Issue Level added to encode/decode support
By default, invalid parity will not show on decode (with option to show)
Added two new 36-bit formats including first format to use issue level

3 years agoRedesign of lf hid card format handler as discussed with @marshmellow42
grauerfuchs [Mon, 27 Aug 2018 18:03:46 +0000 (14:03 -0400)]
Redesign of lf hid card format handler as discussed with @marshmellow42

The new handler accepts multiple formats of the same length.
Because of this, the existing pack/unpack commands are unsupported
and have been removed and replaced with 'lf hid encode' and 'lf hid decode'.
The decode command will test a packed Prox ID against all programmed
formats and return results for all matching formats.
The encode command takes the parameter of format name instead of
bit length (as per the old pack command). Additionally, an 'lf hid write'
command has been added as a single-command combination of encode and clone.

To support easier addition of new formats, a library for handling card
fields has been added. This will allow direct access to the card bits,
to linear fields, and to non-linear (jumping) fields in a single line
of code without having to resort to managing bit positions or masks
on the underlying data. A number of new formats have been added as working
examples of the new support functions.

3 years agoMerge pull request #9 from Proxmark/master
grauerfuchs [Wed, 22 Aug 2018 22:57:48 +0000 (18:57 -0400)]
Merge pull request #9 from Proxmark/master

Pulling in most recent changes in official code tree

3 years agoMerge pull request #649 from grauerfuchs/master
marshmellow42 [Wed, 22 Aug 2018 15:21:50 +0000 (11:21 -0400)]
Merge pull request #649 from grauerfuchs/master

client: lf hid - parity completed, native long-tag support in pack/unpack/clone

3 years agoAdd Smartcard functions (RDV4.0) (#646)
marshmellow42 [Tue, 21 Aug 2018 03:08:49 +0000 (23:08 -0400)]
Add Smartcard functions (RDV4.0) (#646)

* allow common makefile options-defines

* remove non-existing file references

* Uncomment lcd option (still) not enabled by default

use Makefile_Enabled_Options.common
to enable lcd if desired.

* Add Smartcard Functions

* add smartcard to menu + make get atr work

sc is now functioning as far as my limited knowledge takes me

* sc cleanup - add init to all sc commands...

because cmds won't work until the first init happens.  (multiple inits
don't appear to affect it negatively)

* default options to exclude Smartcard

for main repo

* update changelog

3 years agoLegic: fixed write (#655)
AntiCat [Tue, 21 Aug 2018 03:08:06 +0000 (05:08 +0200)]
Legic: fixed write (#655)

Due to an oversight the bytes to be written were fetched
from the wrong location. This is fixed now.

3 years agoLegic: rewrite reader to use xcorrelation and precise timing (#654)
AntiCat [Mon, 20 Aug 2018 20:29:34 +0000 (22:29 +0200)]
Legic: rewrite reader to use xcorrelation and precise timing (#654)

* Legic: rewrite reader to use xcorrelation and precise timing
 - Even tough Legic tags transmit just AM, receiving using
   xcorrelation results in a significantly better signal
   quality.
 - Switching from bit bang to a hardware based ssc frees
   up CPU time for other tasks e.g. prng and demodulation
 - Having all times based on a fixed ts, results in perfect
   rwd-tag synchronization without magic +/- calculations.
* hi_read_tx: remove jerry-riged hysteresis based receiver
- This feature got obsolete by a x-correlation based receiver.
* Legic: adjusted sampling to new ssp clock speed
- Sampling is 4 times faster and pipeline daly reduced to 1/4.
 The new code samples each bit earyler to account for the
 shorter pipeline. That introduced bit errors by leeking the
 next bit into the current one.
* Legic: average 8 samples for better noise rejection.
* Update CHANGELOG.md

3 years ago Adding native support for HID long-format 649/head
grauerfuchs [Sun, 19 Aug 2018 15:14:52 +0000 (11:14 -0400)]
Adding native support for HID long-format
    Removal of "l" flag for long writes; not needed anymore.
    Added HID Corporate 1000 48-bit format to known formats list
    Simulation not yet updated; need to modify ARM commands to support it
    Completed parity support on all included HID formats

3 years agoISO15693 device side improvements (#652)
pwpiwi [Wed, 15 Aug 2018 12:03:20 +0000 (14:03 +0200)]
ISO15693 device side improvements (#652)

* ISO15693 device side improvements
* increase accuracy by doubling the sample frequency (hi_read_rx_xcorr.v)
* adjust armsrc/iso15693.c and client/cmdhf15.c accordingly
* use more accurate approximation for sqrt(ci^2 + cq^2)
* improve EOF detection (was often mistaken for Logic0, resulting in "error, uneven octet! (extra bits!)")
* hi_read_r_xcorr.v: avoid overflows during accumulation and truncation
* explicitely cast unsigned ADC samples to signed

3 years agosome cards need to have Le=0x00, some need to not have... (#651)
Oleg Moiseenko [Tue, 14 Aug 2018 08:15:51 +0000 (11:15 +0300)]
some cards need to have Le=0x00, some need to not have... (#651)

3 years agofix: 32bit tick timer based on TC0 and TC1 (#653)
AntiCat [Tue, 14 Aug 2018 07:24:02 +0000 (09:24 +0200)]
fix: 32bit tick timer based on TC0 and TC1 (#653)

TC1 counts the number of TC0 overflows (carry bits).
In random conditions TC1 would return or stay at zero,
instead of counting up. This due to the behavior of the
reset signal.

SAM7S Series Datasheet, 33.5.6 Trigger:
Regardless of the trigger used, it will be taken into account
at the following active edge of the selected clock. This means
that the counter value can be read differently from zero just
after a trigger, especially when a low frequency signal is
selected as the clock.

The new code first prepares TC1 and asserts TC1 trigger and
then prepares TC0 and asserts TC0 trigger. The TC0 start-up
will reset TC1.

3 years agoBootrom version fix + .gitignore (#645)
Fl0-0 [Tue, 7 Aug 2018 07:23:11 +0000 (09:23 +0200)]
Bootrom version fix + .gitignore (#645)

* Fix bootrom Makefile

* Add armsrc/fpga_version_info.c to .gitignore

3 years agofix option comments to be more clear
marshmellow42 [Mon, 6 Aug 2018 11:39:39 +0000 (07:39 -0400)]
fix option comments to be more clear

3 years agoSeparate WITH_LF and WITH_LF_StandAlone
marshmellow42 [Mon, 6 Aug 2018 11:27:37 +0000 (07:27 -0400)]
Separate WITH_LF and WITH_LF_StandAlone

3 years agomod hw version: (#631)
pwpiwi [Sun, 5 Aug 2018 16:15:03 +0000 (18:15 +0200)]
mod hw version: (#631)

* create fpga version info at compile time (by additional functionality in fpgacompress)
* remove hw version caching (prepare USB reconnect)
* fix calculation of available compressed bytes in fpga_loader.c

3 years agoallow common makefile options-defines (#635)
marshmellow42 [Sun, 5 Aug 2018 16:13:44 +0000 (12:13 -0400)]
allow common makefile options-defines (#635)

3 years agoMerge pull request #638 from grauerfuchs/master
marshmellow42 [Sat, 4 Aug 2018 11:43:27 +0000 (07:43 -0400)]
Merge pull request #638 from grauerfuchs/master

fix truncation issue on "lf t55 config d"

3 years agofix truncation issue on "lf t55 config" modulation 638/head
grauerfuchs [Sat, 4 Aug 2018 10:26:36 +0000 (06:26 -0400)]
fix truncation issue on "lf t55 config" modulation

Fix for issue #637

3 years agoAdds `lf hid pack` and `lf hid unpack` offline commands. (#614)
Michael Farrell [Mon, 30 Jul 2018 17:33:06 +0000 (03:33 +1000)]
Adds `lf hid pack` and `lf hid unpack` offline commands. (#614)

* These are used to pack and unpack the bit length, facility code and card number from "short" HID Prox IDs.
* This also simplifies some repeated code that is used to parse hex digits in lfhid, and adds basic client-side validation to the `lf hid clone` and `lf hid sim` commands, for when an ID that is too long is entered.
* Implements parity checks/calculation for 26-bit H10301 cards.
* Adds links to useful resources for HID Prox cards.
* Adds an explicit warning about the lack of parities on non-26-bit cards.
* Changes all the examples to use 26-bit IDs that have a parity bit set.

3 years agosave 2.3K flash-memory by avoiding a single floating point operation (#630)
pwpiwi [Thu, 26 Jul 2018 15:18:10 +0000 (17:18 +0200)]
save 2.3K flash-memory by avoiding a single floating point operation (#630)

3 years agoFix Gcc 8 warnings (#632)
Fl0-0 [Thu, 26 Jul 2018 15:17:11 +0000 (17:17 +0200)]
Fix Gcc 8 warnings (#632)

3 years agofix: array index out of range in mfkeys.log (thanks to @TomHarkness)
pwpiwi [Thu, 19 Jul 2018 16:01:18 +0000 (18:01 +0200)]
fix: array index out of range in mfkeys.log (thanks to @TomHarkness)

3 years agoAllow disabling unlink() with -DNO_UNLINK. (#625)
Michael Farrell [Mon, 9 Jul 2018 07:49:03 +0000 (15:49 +0800)]
Allow disabling unlink() with -DNO_UNLINK. (#625)

3 years agoIgnore DS_Store (#620)
stuiterveer [Wed, 20 Jun 2018 04:34:00 +0000 (06:34 +0200)]
Ignore DS_Store (#620)

Prevent further commits containing DS_Store files

3 years agoCode cleanup (#616)
pwpiwi [Wed, 13 Jun 2018 06:13:20 +0000 (08:13 +0200)]
Code cleanup (#616)

* coverity fixes (including a real bug in cmdhftopaz.c)
* Typo fix
* replace TRUE/FALSE by stdbool true/false

3 years agoFixes a double-free issue in CloseProxmark: (#617)
Michael Farrell [Mon, 4 Jun 2018 11:54:41 +0000 (21:54 +1000)]
Fixes a double-free issue in CloseProxmark: (#617)

- CloseProxmark now clears global state.

- CloseProxmark now checks for a non-null serial_port before calling uart_close, to avoid unintentional double-free'ing serial_port.

- main now calls CloseProxmark once.

3 years agoUSB comms: part 4 towards @micolous PR #463
pwpiwi [Sun, 3 Jun 2018 12:25:20 +0000 (14:25 +0200)]
USB comms: part 4 towards @micolous PR #463

* make uart_communication(), storeCommand() and getCommand() static in comms.c
* move receiver thread creation and respective mutexes to comms.c
* add mutex and signal for tx buffer
* use comms.c for flasher as well
* remove comm functions from client/proxmark3.h
* this completes isolating all USB communication related functions in comms.c
* don't assume a port to be defined by a name. Change parameter in OpenProxmark() to void*
* comms.c: set sp and serial_port_name to NULL when offline

3 years agoDelete .DS_Store (#613)
Fl0-0 [Tue, 29 May 2018 16:05:32 +0000 (18:05 +0200)]
Delete .DS_Store (#613)

Mac hidden file accidentally merged in PR #593.

3 years agoAdded mifarePlus.lua script for communication with Mifare Plus. (#593)
Dominic Celiano [Mon, 28 May 2018 19:32:48 +0000 (20:32 +0100)]
Added mifarePlus.lua script for communication with Mifare Plus. (#593)

Personalize MifarePlus EV1 cards

3 years agofix gui (plot) bugs (#604)
marshmellow42 [Tue, 15 May 2018 06:19:49 +0000 (02:19 -0400)]
fix gui (plot) bugs (#604)

G keypress event would cause a crash if no data
Q keypress didn't work.

Thanks to @iceman1001 for identifying and providing the fixes.

3 years agofix HitagS simulation erors (issue #605) (#606)
pwpiwi [Fri, 11 May 2018 03:24:02 +0000 (05:24 +0200)]
fix HitagS simulation erors (issue #605) (#606)

3 years agorework of GetFromBigBuf() (#597)
pwpiwi [Tue, 8 May 2018 05:54:49 +0000 (07:54 +0200)]
rework of GetFromBigBuf() (#597)

* this should fix crashes reported in issue #497
* don't allow receiver thread to write directly into arbitrary main thread's memory
* instead use cmdBuffer[] for CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K as well
* add timeout and warning options to GetFromBigBuf(), same as in WaitForResponseTimeoutW()
* move GetFromBigBuf() from data.c to comms.c
* remove data.c and data.h

3 years agoMerge pull request #600 from marshmellow42/master
Iceman [Sat, 5 May 2018 04:59:39 +0000 (06:59 +0200)]
Merge pull request #600 from marshmellow42/master

more graceful exit to lf search if no signal found

3 years agomore graceful exit to lf search if no signal found 600/head
marshmellow42 [Sat, 5 May 2018 03:54:01 +0000 (23:54 -0400)]
more graceful exit to lf search if no signal found

3 years agoUpdate CHANGELOG.md
pwpiwi [Fri, 4 May 2018 06:25:08 +0000 (08:25 +0200)]
Update CHANGELOG.md

3 years agoChange driver file proxmark3.inf to support both old and new Vendor/Product IDs
pwpiwi [Fri, 4 May 2018 06:19:37 +0000 (08:19 +0200)]
Change driver file proxmark3.inf to support both old and new Vendor/Product IDs

(see http://www.proxmark.org/forum/viewtopic.php?pid=32072#p32072)

3 years agofix bug if -DWITH_ISO14443a_StandAlone is removed from makefile (#598)
marshmellow42 [Thu, 3 May 2018 17:36:51 +0000 (13:36 -0400)]
fix bug if -DWITH_ISO14443a_StandAlone is removed from makefile (#598)

3 years agoUSB comms: part 3 towards @micolous PR#463
pwpiwi [Sat, 28 Apr 2018 08:09:16 +0000 (10:09 +0200)]
USB comms: part 3 towards @micolous PR#463

* change variable 'sp' from global to static
* move code to open and close USB port to comms.c (OpenProxmark() and CloseProxmark())
* change scope of USBCommandReceived() to static
* (flasher still unchanged)

3 years agoUSB comms: part 2 towards @micolous PR#463 (#595)
pwpiwi [Tue, 24 Apr 2018 06:27:29 +0000 (08:27 +0200)]
USB comms: part 2 towards @micolous PR#463 (#595)

* change variable 'offline' from global to static
* change variable 'FlushAfterWrite' from global to static
* remove unused global variable 'current_command'
* WaitForResponseTimeoutW(CMD_UNKNOWN, ...) waits for any command
* #include "printf.h" or <stdio.h> in iso15693tools.c to define sprintf()
* and some minor changes/comments

3 years agoFix for swapped parity when using lf_bulk_program.lua (#591)
Tom Harkness [Tue, 3 Apr 2018 06:14:51 +0000 (16:14 +1000)]
Fix for swapped parity when using lf_bulk_program.lua (#591)

3 years agoUSB comm: prepare for @micolous change (PR#463) (#587)
pwpiwi [Sat, 31 Mar 2018 07:52:43 +0000 (09:52 +0200)]
USB comm: prepare for @micolous change (PR#463) (#587)

* move communication related code from proxmark3.c and cmdmain.c to new file comms.c
* replace byte_t by uint8_t in uart_posix.c and uart_win32.c
* move OpenProxmark() and CloseProxmark() from flasher.c to flash.c
* move print_lock mutex including initializer to ui.c
* minor changes in printing help texts
* no changes in comms functionality yet

3 years agoadd: save and load options in hf list (#577)
pwpiwi [Fri, 30 Mar 2018 15:55:41 +0000 (17:55 +0200)]
add: save and load options in hf list (#577)

3 years agoFix empty key list bug in mfkeys.lua (#579)
AnthraX1 [Fri, 30 Mar 2018 15:54:45 +0000 (02:54 +1100)]
Fix empty key list bug in mfkeys.lua (#579)

When input key list size is greater than 85, table.concat() returns empty because the last parameter is the end offset not the increment value.

3 years agoMerge pull request #589 from Proxmark/revert-588-indala-preamble-fix
pwpiwi [Wed, 28 Mar 2018 12:58:46 +0000 (14:58 +0200)]
Merge pull request #589 from Proxmark/revert-588-indala-preamble-fix

Revert "Fix offset Indala UID display"

3 years agoRevert "Fix offset Indala UID display" 589/head
marshmellow42 [Wed, 28 Mar 2018 12:50:08 +0000 (08:50 -0400)]
Revert "Fix offset Indala UID display"

3 years agoMerge pull request #588 from megabug/indala-preamble-fix
Iceman [Wed, 28 Mar 2018 11:10:33 +0000 (13:10 +0200)]
Merge pull request #588 from megabug/indala-preamble-fix

Fix offset Indala UID display

Impressum, Datenschutz