status-im
/
keycard-go
mirror of https://github.com/status-im/keycard-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use installer for install command

This commit is contained in:
Andrea Franz 2019-03-06 17:57:52 +01:00
parent 341eec2a18
commit b5c2c8d0a9
No known key found for this signature in database
GPG Key ID: 4F0D2F2D9DE7F29D
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/keycard/main.go
View File

@ -14,7 +14,7 @@ import (
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
) )
type commandFunc func(*Initializer) error type commandFunc func(*scard.Card) error
var ( var (
logger = log.New("package", "status-go/cmd/keycard") logger = log.New("package", "status-go/cmd/keycard")
@ -130,9 +130,8 @@ func main() {
logger.Debug("card protocol", "T", "unknown") logger.Debug("card protocol", "T", "unknown")
} }
i := NewInitializer(card)
if f, ok := commands[command]; ok { if f, ok := commands[command]; ok {
err = f(i) err = f(card)
if err != nil { if err != nil {
logger.Error("error executing command", "command", command, "error", err) logger.Error("error executing command", "command", command, "error", err)
os.Exit(1) os.Exit(1)
@ -179,7 +178,7 @@ func askUint8(description string) uint8 {
return uint8(i) return uint8(i)
} }
func commandInstall(i *Initializer) error { func commandInstall(card *scard.Card) error {
if *flagCapFile == "" { if *flagCapFile == "" {
logger.Error("you must specify a cap file path with the -f flag\n") logger.Error("you must specify a cap file path with the -f flag\n")
usage() usage()
@ -191,17 +190,13 @@ func commandInstall(i *Initializer) error {
} }
defer f.Close() defer f.Close()
fmt.Printf("installation can take a while...\n") i := NewInstaller(card)
err = i.Install(f, *flagOverwrite)
if err != nil {
fail("installation error", "error", err)
}
fmt.Printf("applet installed successfully.\n") return i.Install(f, *flagOverwrite)
return nil
} }
func commandInfo(i *Initializer) error { func commandInfo(card *scard.Card) error {
i := NewInitializer(card)
info, err := i.Info() info, err := i.Info()
if err != nil { if err != nil {
return err return err
@ -218,7 +213,8 @@ func commandInfo(i *Initializer) error {
return nil return nil
} }
func commandDelete(i *Initializer) error { func commandDelete(card *scard.Card) error {
i := NewInitializer(card)
err := i.Delete() err := i.Delete()
if err != nil { if err != nil {
return err return err
@ -229,7 +225,8 @@ func commandDelete(i *Initializer) error {
return nil return nil
} }
func commandInit(i *Initializer) error { func commandInit(card *scard.Card) error {
i := NewInitializer(card)
secrets, err := i.Init() secrets, err := i.Init()
if err != nil { if err != nil {
return err return err
@ -242,7 +239,8 @@ func commandInit(i *Initializer) error {
return nil return nil
} }
func commandPair(i *Initializer) error { func commandPair(card *scard.Card) error {
i := NewInitializer(card)
pairingPass := ask("Pairing password") pairingPass := ask("Pairing password")
pin := ask("PIN") pin := ask("PIN")
info, err := i.Pair(pairingPass, pin) info, err := i.Pair(pairingPass, pin)
@ -256,7 +254,8 @@ func commandPair(i *Initializer) error {
return nil return nil
} }
func commandStatus(i *Initializer) error { func commandStatus(card *scard.Card) error {
i := NewInitializer(card)
index := askUint8("Pairing index") index := askUint8("Pairing index")
key := askHex("Pairing key") key := askHex("Pairing key")