diff options
author | Guillaume Ballet <gballet@gmail.com> | 2019-05-31 17:30:28 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2019-05-31 17:30:28 +0800 |
commit | 7a22da98b9f81d206eb65d1fa4f5e773d888bac3 (patch) | |
tree | 3a28f61d12c7b43e5ab4a5b5c7ed2c9e8cbf8a94 /accounts | |
parent | 30263ad37d49c014512a9a7d8abdd17f305843e9 (diff) | |
download | go-tangerine-7a22da98b9f81d206eb65d1fa4f5e773d888bac3.tar go-tangerine-7a22da98b9f81d206eb65d1fa4f5e773d888bac3.tar.gz go-tangerine-7a22da98b9f81d206eb65d1fa4f5e773d888bac3.tar.bz2 go-tangerine-7a22da98b9f81d206eb65d1fa4f5e773d888bac3.tar.lz go-tangerine-7a22da98b9f81d206eb65d1fa4f5e773d888bac3.tar.xz go-tangerine-7a22da98b9f81d206eb65d1fa4f5e773d888bac3.tar.zst go-tangerine-7a22da98b9f81d206eb65d1fa4f5e773d888bac3.zip |
accounts/scwallet: flag to specify path to smartcard daemon (#19439)
* accounts/scwallet: Add a switch to enable smartcard support
* accounts: change the meaning of the switch
* disable card support in windows until tested
* only activate account if pcscd socket file is present
* the switch is now the path to the socket file
* accounts/scwallet: holiman's review feedback
* accounts/scwallet: send the path to go-pcsclite
* accounts/scwallet: add default, per platform path
* accounts/scwallet: fix error log warning
* accounts/scwallet: update pcsc lib to latest
* accounts/scwallet: use default path from pcsclite
* scwallet: forgot to change switch name
* cmd: minor style cleanups (error handling first, then happy path)
Diffstat (limited to 'accounts')
-rw-r--r-- | accounts/scwallet/hub.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/accounts/scwallet/hub.go b/accounts/scwallet/hub.go index d1440cb96..5f939c658 100644 --- a/accounts/scwallet/hub.go +++ b/accounts/scwallet/hub.go @@ -152,8 +152,8 @@ func (hub *Hub) setPairing(wallet *Wallet, pairing *smartcardPairing) error { } // NewHub creates a new hardware wallet manager for smartcards. -func NewHub(scheme string, datadir string) (*Hub, error) { - context, err := pcsc.EstablishContext(pcsc.ScopeSystem) +func NewHub(daemonPath string, scheme string, datadir string) (*Hub, error) { + context, err := pcsc.EstablishContext(daemonPath, pcsc.ScopeSystem) if err != nil { return nil, err } |