Commit graph

2292 commits

Author SHA1 Message Date
☃ Stephen Shkardoon ☃
5f84531b82 Paradox clone functionality implemented (#747)
This involves a refactor to the arm HID code to allow for arbitrary
preambles (such as HID Proximity and Paradox).
The client also borrows from the HID code, but is not shared, so could
use a significant refactor in the future.
2019-01-05 09:48:59 +01:00
pwpiwi
8d7d7b6187
Emv commands work with smartcard interface (RfidResearchGroup PR67 by @Merlokk) (#743)
* replace 'hf emv' commands by 'emv' commands
* Enable smartcard commands by default (-DWITH_SMARTCARD)
* update i2c.c from RfidResearchGroup repository
* update smartcard.c from RfidResearchGroup repository
2019-01-05 09:47:12 +01:00
pwpiwi
968ad67280
avoid compiler warning in client/cliparser/argtable3.c (#746) 2019-01-04 08:53:30 +01:00
Oleg Moiseenko
0d5545cee0 delete travis. it plaed in folder CI (#736) 2018-12-07 18:55:35 +01:00
Oleg Moiseenko
0bb514502a Fido2 (#727)
* add tinycbor
* add client/fido
* add test file with options for fido2
* hf fido commands
* add changelog
2018-12-07 16:42:37 +01:00
ralik
27d06e0447 Update default_pwd.dic (#735) 2018-12-07 14:10:08 +01:00
Fl0-0
daccbcdc8d Added mifare trailer block decoding for sector commands (#734) 2018-12-07 14:09:41 +01:00
pwpiwi
aa0b1c431f
Change mbedtls initializers to be compatible with older versions of gcc (#732)
* fix issue #731
2018-12-06 07:53:25 +01:00
Jean-Michel Picod
a015ef3733 Fix compilation error on OS X (#730) 2018-12-04 08:12:05 +01:00
Vladimir Serbinenko
d664113aee Support TCP ports for proxmark (#720)
On ChromeOS Linux apps can't access serial port but they can connect to TCP,
so I wrote a simple app to forward TCP to serial. I suppose this can
have other uses as well.
2018-12-03 08:53:26 +01:00
Oleg Moiseenko
ac4ecfe353 added mifare trailer block decoding (#726) 2018-12-03 08:29:13 +01:00
florianrock
383f4e2479 Update hitagS.c (#729)
Bugfix for #605 - wrong compare for tag.LKP
2018-12-03 08:23:53 +01:00
Fl0-0
9c87879e36 Fix public key lenght to 65 bytes (#725) 2018-11-30 18:44:52 +01:00
florianrock
7b6e320533 HitagS Improvements (#721)
* support of HITAG S standard communication mode
* fixed wrong AC (Anti Collision) decoding
* support of block read mode
* fixed wrong uid send when using simulation
* support of communication mode parameter  (client is backward compatible)
* support of start-page parameter (important for some weird tags) (client is backward compatible)
* also expect pages if tag memory size in con0 is 11 (we got some tags)
* corrected hitagS reader cmd help
2018-11-30 17:42:22 +01:00
Fl0-0
994f21fe01 Fix format-truncation warning, missing string.h inclusion and strnlen warning (#723)
* Fix format-truncation warning, missing string.h inclusion and strnlen warning

* Dynamic string width field
2018-11-30 09:03:44 +01:00
Oleg Moiseenko
6a2bd85719 jansson update. 2.11 to 2.12 (#724) 2018-11-30 08:43:46 +01:00
pwpiwi
5594c6215e
fix "hf mf chk" <t|d|s|ss> flags (based on PR #700) (#718) 2018-11-30 07:45:01 +01:00
Fl0-0
03439be30f Fix util.c:116:2: error: unknown type name ‘va_list’ (#722) 2018-11-26 08:11:11 +01:00
Oleg Moiseenko
6b882a3918 Fido U2F complete (#716)
* add pkwrite
* asn1print
* asn1dump and CA
* added PrintAndLogEx for merge commits between repo easier than now
* changelog
2018-11-25 16:56:12 +01:00
Oleg Moiseenko
e0991f6aa7 Get rid of polarssl (#717) 2018-11-23 19:03:46 +01:00
Oleg Moiseenko
700d868794 move from polarssl to mbedtls (#708)
* update polarssl to mbedtls
* fix a warning in armsrc/iso15693
* added random generator and ecdsa test
* added signature check to test
* move crypto lib to client directory
2018-11-19 09:02:38 +01:00
Oleg Moiseenko
39cc1c879e FIDO U2F NFC authenticators (#697)
* `hf fido` command
* detects FIDO tag
* add new commands for fido u2f
* added changelog
* added fido2 info
2018-11-17 20:22:21 +02:00
Oleg Moiseenko
8fa6838476 fix - some card cant reset so quick. (#713) 2018-11-17 19:04:56 +02:00
Oleg Moiseenko
1429030854 fix get length in tlv (#714) 2018-11-17 19:04:25 +02:00
pwpiwi
bdf96aae39 fix hf 15 reader (merge error) 2018-10-31 22:00:36 +01:00
Oleg Moiseenko
6eeb5f1c29 fix warning under linux (#709) 2018-10-31 19:47:37 +01:00
drhatson
4b5d696c17 changes to mifare plus code (#706) 2018-10-31 19:46:12 +01:00
Oleg Moiseenko
c8a0f55031 Mfp read plain (#704)
* added aes-cmac-128
* aes-cmac added to cryptosystem. not works(
2018-10-26 19:18:53 +02:00
Oleg Moiseenko
cdc9a7562d inc timeouts (#705) 2018-10-26 14:43:06 +02:00
Oleg Moiseenko
ae3340a0fb Mfp commands (#698)
* add write perso from https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua
* commit perso from https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L184
* added errors https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L91
* fix bug in CLIParamHexToBuf
* added init card command
* auth4 refactoring
* add changelog
2018-10-24 18:58:12 +02:00
pwpiwi
3685f89cbd small fix to please @dmaij's compiler (issue #703) 2018-10-23 19:50:37 +02:00
pwpiwi
8c6cca0ba1
Fix hf 15 sim (#696)
* added ISO15693 coding for tag messages (CodeIso15693AsTag())
* added ISO15693 decoding for reader commands (Handle15693SampleFromReader())
* send tag inventory response in either high or low speed
* some refactoring and formatting
2018-10-23 08:22:13 +02:00
Oleg Moiseenko
666fa6e1cf deploy in msys2 and proxspace (#702) 2018-10-22 22:27:37 +02:00
Oleg Moiseenko
dc3e2acf33 mf plus info with detect sl mode (#695) 2018-10-17 20:55:04 +02:00
Oleg Moiseenko
95b697f017 Emv scan (#691)
* added `hf emv scan` command and options
* add tlv tag save to json
* added tlv tree navigation
* added kernel id and moved some parts of code in ppse
* save gpo result
* added read records
* extract childs from tlv works
* added application data list
* added work with application data section
* flag --extract works
* refactoring: move json functions to emvjson.h/c
* added path.c to jansson
* refactoring: move ParamLoadFromJson
* refactoring: move defparams.json to tag-name-value structure
* refactoring and add key recovering
* added some codes to appdata list
* refactoring: process response format 1 from GPO
* added save mode
* added RID to app data
* add file name handling and small refactoring in argtable string processing
* added finalization logic to `emv scan` and option to remove hash checking in key recovery
2018-10-17 20:53:34 +02:00
Oleg Moiseenko
54e3cfcb74 small improvements in auth (#694) 2018-10-12 14:13:58 +02:00
Oleg Moiseenko
ae027818ac small fix in auth (#693) 2018-10-11 19:28:29 +02:00
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