Commit graph

2355 commits

Author SHA1 Message Date
Oleg Moiseenko
7dadcc959f auth 14443-4 (#692)
* AES authentication
2018-10-10 22:34:04 +02:00
pwpiwi
9f38391395 Update CHANGELOG for 3.1.0 release 2018-10-10 08:35:03 +02:00
Oleg Moiseenko
92479429c2 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
2018-10-08 07:48:37 +02:00
AntiCat
b742ab8cc3 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.
2018-10-08 07:20:21 +02:00
AntiCat
2a53731106 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.
2018-10-08 07:15:29 +02:00
pwpiwi
70b2fc0abd
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
2018-10-07 17:32:03 +02:00
AntiCat
351d6d17b3 Fix: ControlWidget placement (#690)
* ui: code cleanup
* ui: move control widget below plot
2018-10-07 17:30:47 +02:00
pwpiwi
eed83b910c Add another #ifdef for the __BIONIC__ fix (the effect of setting p_thread to 0 is undefined for other libs) 2018-10-06 17:48:43 +02:00
pwpiwi
a025b74606 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2018-10-06 17:35:40 +02:00
Michael Farrell
7b2cd970ec 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().

ed16b344e7/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.
2018-10-06 17:33:44 +02:00
pwpiwi
b49aec796c Merge branch 'master' of https://github.com/Proxmark/proxmark3 2018-10-06 09:06:13 +02:00
Oleg Moiseenko
11146fc1e1 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
2018-10-01 20:12:14 +02:00
Oleg Moiseenko
f23565c38b 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
2018-09-28 18:03:21 +02:00
pwpiwi
48354ddb54 Merge branch 'emv_argtable' of https://github.com/merlokk/proxmark3 2018-09-28 17:59:14 +02:00
pwpiwi
b8a92318be Merge branch 'master' of https://github.com/Proxmark/proxmark3 2018-09-24 13:04:21 +02:00
pwpiwi
c13afca1f5 Fix: accidentially deleted line in fpgaloader.c 2018-09-24 13:03:13 +02:00
Oleg Moiseenko
2d4db38754 FIX: APDUCodeTable has more items than 100 (#682)
4fa0835d5f
2018-09-24 12:48:07 +02:00
Oleg Moiseenko
16cdfa6355
Merge branch 'master' into emv_argtable 2018-09-24 13:27:30 +03:00
Fl0-0
a7e1b46d51 Jansson gcc8 fix (#679)
* Fix error in error.c
* Fix error in load.c
2018-09-22 17:51:13 +02:00
pwpiwi
050aa18b13
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
2018-09-21 08:27:35 +02:00
marshmellow42
2758d83652
Merge pull request #658 from grauerfuchs/master
rework of 'lf hid' commands for better card format handling
2018-09-18 22:23:47 -04:00
marshmellow42
161c40fb52
Merge branch 'master' into master 2018-09-18 22:12:11 -04:00
Oleg Moiseenko
696e863078 added EMV tag #9F6E (#676) 2018-09-18 18:52:41 +02:00
merlokk
57548f275a hf emv exec works with argtable 2018-09-18 19:06:59 +03:00
merlokk
61ad070f56 delete unused procedure after merge 2018-09-18 18:36:03 +03:00
Oleg Moiseenko
654b6ae3f4
Merge branch 'master' into emv_argtable 2018-09-18 18:29:59 +03:00
Oleg Moiseenko
556826b5d5 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
2018-09-18 07:15:34 +02:00
Michael Farrell
82258709f6 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
2018-09-17 08:35:45 +02:00
AntiCat
2dedd5eaec Update changelog and fix build error (#674)
* Update CHANGELOG.md
2018-09-17 07:56:53 +02:00
uhei
b4ba1eeabe fpgaloader: fix function accordingly to #669 (#673)
FpgaSetupSscDma uses uint16_t and not int with #669
2018-09-17 07:55:51 +02:00
pwpiwi
6a5d4e17f4
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
2018-09-16 00:53:28 +02:00
grauerfuchs
0d7ee55f9d
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.
2018-09-14 06:32:29 -04:00
grauerfuchs
173ba1e1a2
Merge branch 'master' into master 2018-09-13 21:30:24 -04:00
grauerfuchs
fc7a78f2d1 Changes requested by @marshmellow42
Added CHANGELOG details for new lf hid commands
Restored basic ARM-side decoding of 26-bit and 35-bit cards
2018-09-13 21:05:11 -04:00
merlokk
8c2ae2176d added changelog 2018-09-13 20:03:10 +03:00
merlokk
0c4750c3ba small fixes in helps 2018-09-13 19:58:26 +03:00
merlokk
02ab5afa87 add terminal decision to genac and small fixes 2018-09-13 19:53:14 +03:00
merlokk
48c32f0436 added CDA transaction to hf emv genac 2018-09-13 18:44:20 +03:00
merlokk
11a78e048c added intauth and genac commands. works. 2018-09-13 18:38:03 +03:00
grauerfuchs
53e2f2fad1
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
2018-09-13 06:30:26 -04:00
merlokk
ad23886a6f small fix 2018-09-12 20:22:24 +03:00
merlokk
8ffdccffa0 hf emv challenge works 2018-09-12 20:20:27 +03:00
merlokk
ab2d91f86d hf emv readrec works and some changes in help 2018-09-12 20:08:16 +03:00
merlokk
cd2f1acd1b hf emv gpo works 2018-09-12 19:51:20 +03:00
merlokk
626e650fbf added new functions to hf emv 2018-09-11 17:02:22 +03:00
merlokk
a4662ca9f9 hf emv pse and sketch for the other commands 2018-09-11 16:11:58 +03:00
merlokk
24e0d538d1 delete old help 2018-09-11 14:58:15 +03:00
merlokk
7d4ba60e8e hf emv select some refactoring 2018-09-11 14:56:33 +03:00
merlokk
3668df05ec hf emv select 2018-09-11 14:49:50 +03:00
merlokk
6d31653c44 move hf emv search to argtable 2018-09-11 12:21:29 +03:00