]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
5 years agoNdef and MAD (#801)
Oleg Moiseenko [Tue, 19 Mar 2019 06:51:10 +0000 (08:51 +0200)]
Ndef and MAD (#801)

* move mifare stuff to separate folder
* add mad and ndef

5 years agoAdded some LED utility functions (#802)
Samson Gama [Fri, 15 Mar 2019 06:41:07 +0000 (23:41 -0700)]
Added some LED utility functions (#802)

5 years agofix hitag functions (issue #798) (#800)
pwpiwi [Wed, 13 Mar 2019 09:53:40 +0000 (10:53 +0100)]
fix hitag functions (issue #798) (#800)

* ... and whitespace formating

5 years agofix LED signalling in hf 15 snoop and hf 14a snoop (#797)
pwpiwi [Tue, 12 Mar 2019 06:49:23 +0000 (07:49 +0100)]
fix LED signalling in hf 15 snoop and hf 14a snoop (#797)

* LED_A (yellow): PM3 is active (snooping)
* LED_B (green): reader is sending a command
* LED_C (red): tag is sending a reply

5 years agoadd 14a apdu send framing (based on RRG repo PR86 by Merlokk) (#795)
pwpiwi [Tue, 12 Mar 2019 06:46:49 +0000 (07:46 +0100)]
add 14a apdu send framing (based on RRG repo PR86 by Merlokk) (#795)

5 years agochip manufacturer and type identification: (#796)
pwpiwi [Sun, 3 Mar 2019 10:59:38 +0000 (11:59 +0100)]
chip manufacturer and type identification: (#796)

* add more manufacturers
* refactor chipID decoding
* move to separate file taginfo.[ch]

5 years agofix ATR length (#790)
pwpiwi [Tue, 26 Feb 2019 18:48:25 +0000 (19:48 +0100)]
fix ATR length (#790)

* TS, T0, T[A-D][1-4], max. 15 HB, TCK = 34 Bytes

5 years agoEmv scan via contact interface (#789)
Oleg Moiseenko [Thu, 21 Feb 2019 21:02:22 +0000 (23:02 +0200)]
Emv scan via contact interface (#789)

* share getATR from smartcard.h/c
* remove duplicates in tlv.h and add get_uint_8
* check ATS/ATR length

5 years agoAdd raw HF signal plotting (#786)
pwpiwi [Wed, 20 Feb 2019 18:18:12 +0000 (19:18 +0100)]
Add raw HF signal plotting (#786)

* Add raw HF signal plotting
* new fpga module hi_get_trace.v - store A/D converter output to circular buffer on FPGA
* new command 'hf plot' - pull data from FPGA and display it in Graph Window

5 years agofix rare bug in tlv.c (#788)
Oleg Moiseenko [Wed, 20 Feb 2019 17:35:39 +0000 (19:35 +0200)]
fix rare bug in tlv.c (#788)

5 years agoFix for USB uart slowness since PR #720 (#787)
Fl0-0 [Sun, 17 Feb 2019 13:43:40 +0000 (14:43 +0100)]
Fix for USB uart slowness since PR #720 (#787)

5 years agoadd tracing functions (#784)
pwpiwi [Sat, 16 Feb 2019 16:51:04 +0000 (17:51 +0100)]
add tracing functions (#784)

* add trace buffer for PCSC smartcard readers
* new option 'p' in 'hf list' to select PCSC trace buffer
* 'sc list' now supports PCSC smartcard readers
* add 'hf list 14-4' for ISO 14443-4 protocol

5 years agofix emv roca hash error (#781)
pwpiwi [Tue, 12 Feb 2019 08:06:30 +0000 (09:06 +0100)]
fix emv roca hash error (#781)

* fix ICC Public Key Hash calculation
* add -a option to 'emv roca'
* replace print() by PrintAndLogEx() in emv_pki.c

5 years agofix endless loop (#782)
Oleg Moiseenko [Sat, 9 Feb 2019 21:38:09 +0000 (23:38 +0200)]
fix endless loop (#782)

5 years agoemv/sc fixes and modifications: (#780)
pwpiwi [Sat, 9 Feb 2019 14:15:17 +0000 (15:15 +0100)]
emv/sc fixes and modifications: (#780)

* print selected Smartcard Reader in PrintChannel()
* implement 'sc sel <readername>'. Readername can include wildcards * and ?
* fixing EMV APDU exchange (again)
* use EMVExchangeEx() instead of EMVExchange() in fidocore.c

5 years agoUpdate list of Certificate Authorities Public Keys (source: https://www.eftlab.co...
pwpiwi [Wed, 6 Feb 2019 06:51:49 +0000 (07:51 +0100)]
Update list of Certificate Authorities Public Keys (source: https://www.eftlab.co.uk/index.php/site-map/knowledge-base/243-ca-public-keys) (#777)

* allow tabs in client/emv/capk.txt
* fix issue with printing RID and CSN of certificates

5 years agoEVM fixes and additions (RRG repository PRs 78-82 by @merlokk) (#776)
pwpiwi [Wed, 6 Feb 2019 06:50:57 +0000 (07:50 +0100)]
EVM fixes and additions (RRG repository PRs 78-82 by @merlokk) (#776)

5 years agoadded SoloKey certificate (#778)
Oleg Moiseenko [Mon, 4 Feb 2019 18:53:04 +0000 (20:53 +0200)]
added SoloKey certificate (#778)

5 years agofido fix (#775)
Oleg Moiseenko [Mon, 4 Feb 2019 07:03:44 +0000 (09:03 +0200)]
fido fix (#775)

5 years agoUpdate list of known EMV AIDs. Source: https://www.eftlab.co.uk/index.php/site-map...
pwpiwi [Fri, 1 Feb 2019 20:13:00 +0000 (21:13 +0100)]
Update list of known EMV AIDs. Source: https://www.eftlab.co.uk/index.php/site-map/knowledge-base/211-emv-aid-rid-pix (#770)

5 years agoAdding support for standard USB Smartcard Readers (#769)
pwpiwi [Fri, 1 Feb 2019 20:12:20 +0000 (21:12 +0100)]
Adding support for standard USB Smartcard Readers (#769)

* add PCSC reader support to 'sc raw' and all 'emv' commands
* move all APDU -> TPDU mapping to ExchangeAPDUSC()
* print "PSE" instead of "PPSE" when using contact interface
* fix some #defines in protocols.h
* DropField only when using contactless
* some refactoring

5 years agoLegic TagSim: increased reader timeout (#771)
AntiCat [Wed, 30 Jan 2019 21:20:57 +0000 (22:20 +0100)]
Legic TagSim: increased reader timeout (#771)

Bug reports from @raphCode and @uhei over at the
RfidResearchGroup have shown that the tag to rwd
timeout is too short.

5 years agoAdd support for standard USB Smartcard Readers (#765)
pwpiwi [Mon, 28 Jan 2019 20:54:34 +0000 (21:54 +0100)]
Add support for standard USB Smartcard Readers (#765)

* add PCSC interface (pcsc.c and pcsc.h)
* new command 'sc select' to choose an USB Smartcard Reader
* updated CI/.travis.yml accordingly
* remove TCK CRC check in i2c.c It is done in PrintATR() anyway
* Fix TCK CRC check in PrintATR()
* Add PCSC reader support to 'sc info'

5 years agoAdd ROCA vulnerability test (RRG repository PR 76 by @merlokk) (#762)
pwpiwi [Mon, 21 Jan 2019 18:26:54 +0000 (19:26 +0100)]
Add ROCA vulnerability test (RRG repository PR 76 by @merlokk) (#762)

5 years agorestore #755 reverted after #757 (#761)
Fl0-0 [Thu, 17 Jan 2019 08:13:38 +0000 (09:13 +0100)]
restore #755 reverted after #757 (#761)

5 years agoAdd smartcard protocol T=0 (RRG repository PRs 71,72,74,75 by @merlokk) (#757)
pwpiwi [Thu, 17 Jan 2019 06:50:01 +0000 (07:50 +0100)]
Add smartcard protocol T=0 (RRG repository PRs 71,72,74,75 by @merlokk) (#757)

5 years agoAdd hf list 15 (#754)
pwpiwi [Wed, 16 Jan 2019 08:54:19 +0000 (09:54 +0100)]
Add hf list 15 (#754)

and refactoring: move all of hf list code to cmdhflist.c

5 years agoIncrease threshold to 160, fix for issue 756 (#760)
Fl0-0 [Wed, 16 Jan 2019 08:52:20 +0000 (09:52 +0100)]
Increase threshold to 160, fix for issue 756 (#760)

5 years agoAllow skipping or trying different keys in hf mf dump (#759)
Michael Farrell [Wed, 16 Jan 2019 08:51:55 +0000 (21:51 +1300)]
Allow skipping or trying different keys in hf mf dump (#759)

5 years agoadjust CI testscript for new emv commands (#758)
pwpiwi [Wed, 16 Jan 2019 08:40:35 +0000 (09:40 +0100)]
adjust CI testscript for new emv commands (#758)

5 years agoFix CmdSmartUpgrade GCC8 strncpy specified bound depends on the length of the source...
Fl0-0 [Sun, 13 Jan 2019 15:53:09 +0000 (16:53 +0100)]
Fix CmdSmartUpgrade GCC8 strncpy specified bound depends on the length of the source argument warning (#755)

5 years agoFix 15 snoop (#752)
pwpiwi [Sat, 12 Jan 2019 12:28:26 +0000 (13:28 +0100)]
Fix 15 snoop (#752)

* fixing hf 15: implement hf 15 snoop
* rename hf 15 record to hf 15 snoop
* speedup sampling / decoding:
*   new FPGA mode FPGA_HF_READER_RX_XCORR_AMPLITUDE implements amplitude(ci, cq) on FPGA
*   inlining the decoders in iso15693.c
*   inlining memcpy/memset in LogTrace()
*   giving up the moving correlator for SOF in Handle15693SamplesFromTag
* decode more of EOF in Handle15693SamplesFromTag()
* some refactoring

5 years agoRDV4.0 Smartcard Slot Firmware Upgrade (#751)
pwpiwi [Sat, 12 Jan 2019 12:26:53 +0000 (13:26 +0100)]
RDV4.0 Smartcard Slot Firmware Upgrade (#751)

* RDV4.0 Smartcard Slot Firmware Upgrade
* new firmware in client/sc_upgrade_firmware directory
* improved sc upgrade:
   * check SHA-512 of firmware file
   * search and find firmware file in predefined directory
   * more sanity checks
* fixed offline indicators of sc commands

5 years agoAdded ATR decoding (RfidResearchGroup PRs 67/68 by @merlokk) (#749)
pwpiwi [Sat, 12 Jan 2019 12:24:22 +0000 (13:24 +0100)]
Added ATR decoding (RfidResearchGroup PRs 67/68 by @merlokk) (#749)

... and fixed merge errors in cmdsmartcard.c

5 years agoFix CMD_PCF7931_BRUTEFORCE duplicate case value (#750)
Fl0-0 [Mon, 7 Jan 2019 07:55:04 +0000 (08:55 +0100)]
Fix CMD_PCF7931_BRUTEFORCE duplicate case value (#750)

5 years agoPCF7931: improved read code and implemented a simple password bruteforce (#745)
Samuele [Sun, 6 Jan 2019 17:33:06 +0000 (18:33 +0100)]
PCF7931: improved read code and implemented a simple password bruteforce (#745)

* Improved PCF 7931 read code and implemented a simple PCF7931 password bruteforce
* Warning on the PCF7931 bruteforce command

5 years agoFix PrintAndLogEx ERR (#748)
Fl0-0 [Sat, 5 Jan 2019 17:41:51 +0000 (18:41 +0100)]
Fix PrintAndLogEx ERR (#748)

5 years agoParadox clone functionality implemented (#747)
☃ Stephen Shkardoon ☃ [Sat, 5 Jan 2019 08:48:59 +0000 (21:48 +1300)]
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.

5 years agoEmv commands work with smartcard interface (RfidResearchGroup PR67 by @Merlokk) ...
pwpiwi [Sat, 5 Jan 2019 08:47:12 +0000 (09:47 +0100)]
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

5 years agoavoid compiler warning in client/cliparser/argtable3.c (#746)
pwpiwi [Fri, 4 Jan 2019 07:53:30 +0000 (08:53 +0100)]
avoid compiler warning in client/cliparser/argtable3.c (#746)

5 years agodelete travis. it plaed in folder `CI` (#736)
Oleg Moiseenko [Fri, 7 Dec 2018 17:55:35 +0000 (19:55 +0200)]
delete travis. it plaed in folder `CI` (#736)

5 years agoFido2 (#727)
Oleg Moiseenko [Fri, 7 Dec 2018 15:42:37 +0000 (17:42 +0200)]
Fido2 (#727)

* add tinycbor
* add client/fido
* add test file with options for fido2
* hf fido commands
* add changelog

5 years agoUpdate default_pwd.dic (#735)
ralik [Fri, 7 Dec 2018 13:10:08 +0000 (00:10 +1100)]
Update default_pwd.dic (#735)

5 years agoAdded mifare trailer block decoding for sector commands (#734)
Fl0-0 [Fri, 7 Dec 2018 13:09:41 +0000 (14:09 +0100)]
Added mifare trailer block decoding for sector commands (#734)

5 years agoChange mbedtls initializers to be compatible with older versions of gcc (#732)
pwpiwi [Thu, 6 Dec 2018 06:53:25 +0000 (07:53 +0100)]
Change mbedtls initializers to be compatible with older versions of gcc (#732)

* fix issue #731

5 years agoFix compilation error on OS X (#730)
Jean-Michel Picod [Tue, 4 Dec 2018 07:12:05 +0000 (08:12 +0100)]
Fix compilation error on OS X (#730)

5 years agoSupport TCP ports for proxmark (#720)
Vladimir Serbinenko [Mon, 3 Dec 2018 07:53:26 +0000 (08:53 +0100)]
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.

5 years agoadded mifare trailer block decoding (#726)
Oleg Moiseenko [Mon, 3 Dec 2018 07:29:13 +0000 (09:29 +0200)]
added mifare trailer block decoding (#726)

5 years agoUpdate hitagS.c (#729)
florianrock [Mon, 3 Dec 2018 07:23:53 +0000 (08:23 +0100)]
Update hitagS.c (#729)

Bugfix for #605 - wrong compare for tag.LKP

5 years agoFix public key lenght to 65 bytes (#725)
Fl0-0 [Fri, 30 Nov 2018 17:44:52 +0000 (18:44 +0100)]
Fix public key lenght to 65 bytes (#725)

5 years agoHitagS Improvements (#721)
florianrock [Fri, 30 Nov 2018 16:42:22 +0000 (17:42 +0100)]
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

5 years agoFix format-truncation warning, missing string.h inclusion and strnlen warning (#723)
Fl0-0 [Fri, 30 Nov 2018 08:03:44 +0000 (09:03 +0100)]
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

5 years agojansson update. 2.11 to 2.12 (#724)
Oleg Moiseenko [Fri, 30 Nov 2018 07:43:46 +0000 (09:43 +0200)]
jansson update. 2.11 to 2.12 (#724)

5 years agofix "hf mf chk" <t|d|s|ss> flags (based on PR #700) (#718)
pwpiwi [Fri, 30 Nov 2018 06:45:01 +0000 (07:45 +0100)]
fix "hf mf chk" <t|d|s|ss> flags (based on PR #700) (#718)

5 years agoFix util.c:116:2: error: unknown type name ‘va_list’ (#722)
Fl0-0 [Mon, 26 Nov 2018 07:11:11 +0000 (08:11 +0100)]
Fix util.c:116:2: error: unknown type name ‘va_list’ (#722)

6 years agoFido U2F complete (#716)
Oleg Moiseenko [Sun, 25 Nov 2018 15:56:12 +0000 (17:56 +0200)]
Fido U2F complete (#716)

* add pkwrite
* asn1print
* asn1dump and CA
* added PrintAndLogEx for merge commits between repo easier than now
* changelog

6 years agoGet rid of polarssl (#717)
Oleg Moiseenko [Fri, 23 Nov 2018 18:03:46 +0000 (20:03 +0200)]
Get rid of polarssl (#717)

6 years agomove from polarssl to mbedtls (#708)
Oleg Moiseenko [Mon, 19 Nov 2018 08:02:38 +0000 (10:02 +0200)]
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

6 years agoFIDO U2F NFC authenticators (#697)
Oleg Moiseenko [Sat, 17 Nov 2018 18:22:21 +0000 (20:22 +0200)]
FIDO U2F NFC authenticators (#697)

* `hf fido` command
* detects FIDO tag
* add new commands for fido u2f
* added changelog
* added fido2 info

6 years agofix - some card cant reset so quick. (#713)
Oleg Moiseenko [Sat, 17 Nov 2018 17:04:56 +0000 (19:04 +0200)]
fix - some card cant reset so quick. (#713)

6 years agofix get length in tlv (#714)
Oleg Moiseenko [Sat, 17 Nov 2018 17:04:25 +0000 (19:04 +0200)]
fix get length in tlv (#714)

6 years agofix hf 15 reader (merge error)
pwpiwi [Wed, 31 Oct 2018 21:00:36 +0000 (22:00 +0100)]
fix hf 15 reader (merge error)

6 years agofix warning under linux (#709)
Oleg Moiseenko [Wed, 31 Oct 2018 18:47:37 +0000 (20:47 +0200)]
fix warning under linux (#709)

6 years agochanges to mifare plus code (#706)
drhatson [Wed, 31 Oct 2018 18:46:12 +0000 (18:46 +0000)]
changes to mifare plus code (#706)

6 years agoMfp read plain (#704)
Oleg Moiseenko [Fri, 26 Oct 2018 17:18:53 +0000 (20:18 +0300)]
Mfp read plain (#704)

* added aes-cmac-128
* aes-cmac added to cryptosystem. not works(

6 years agoinc timeouts (#705)
Oleg Moiseenko [Fri, 26 Oct 2018 12:43:06 +0000 (15:43 +0300)]
inc timeouts (#705)

6 years agoMfp commands (#698)
Oleg Moiseenko [Wed, 24 Oct 2018 16:58:12 +0000 (19:58 +0300)]
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

6 years agosmall fix to please @dmaij's compiler (issue #703)
pwpiwi [Tue, 23 Oct 2018 17:50:37 +0000 (19:50 +0200)]
small fix to please @dmaij's compiler (issue #703)

6 years agoFix hf 15 sim (#696)
pwpiwi [Tue, 23 Oct 2018 06:22:13 +0000 (08:22 +0200)]
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

6 years agodeploy in msys2 and proxspace (#702)
Oleg Moiseenko [Mon, 22 Oct 2018 20:27:37 +0000 (23:27 +0300)]
deploy in msys2 and proxspace (#702)

6 years agomf plus info with detect sl mode (#695)
Oleg Moiseenko [Wed, 17 Oct 2018 18:55:04 +0000 (21:55 +0300)]
mf plus info with detect sl mode (#695)

6 years agoEmv scan (#691)
Oleg Moiseenko [Wed, 17 Oct 2018 18:53:34 +0000 (21:53 +0300)]
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

6 years agosmall improvements in auth (#694)
Oleg Moiseenko [Fri, 12 Oct 2018 12:13:58 +0000 (15:13 +0300)]
small improvements in auth (#694)

6 years agosmall fix in auth (#693)
Oleg Moiseenko [Thu, 11 Oct 2018 17:28:29 +0000 (20:28 +0300)]
small fix in auth (#693)

6 years agoauth 14443-4 (#692)
Oleg Moiseenko [Wed, 10 Oct 2018 20:34:04 +0000 (23:34 +0300)]
auth 14443-4 (#692)

* AES authentication

6 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

6 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

6 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.

6 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.

6 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

6 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

6 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)

6 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

6 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.

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

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

6 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

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

6 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

Impressum, Datenschutz