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

check response and error

This commit is contained in:
Andrea Franz 2018-10-27 18:12:38 +02:00
parent 5bdb7a8a57
commit 435665f5cf
No known key found for this signature in database
GPG Key ID: 4F0D2F2D9DE7F29D
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lightwallet/actions/actions.go
View File

@ -21,11 +21,7 @@ var (
func SelectNotInitialized(c globalplatform.Channel, aid []byte) ([]byte, error) {
sel := globalplatform.NewCommandSelect(aid)
resp, err := c.Send(sel)
if err != nil {
return nil, err
}
if err = checkOKResponse(resp); err != nil {
if err = checkOKResponse(err, resp); err != nil {
return nil, err
}
@ -39,11 +35,7 @@ func SelectNotInitialized(c globalplatform.Channel, aid []byte) ([]byte, error)
func SelectInitialized(c globalplatform.Channel, aid []byte) (*lightwallet.ApplicationInfo, error) {
sel := globalplatform.NewCommandSelect(aid)
resp, err := c.Send(sel)
if err != nil {
return nil, err
}
if err = checkOKResponse(resp); err != nil {
if err = checkOKResponse(err, resp); err != nil {
return nil, err
}
@ -67,11 +59,8 @@ func Init(c globalplatform.Channel, cardPubKey []byte, secrets *lightwallet.Secr
init := lightwallet.NewCommandInit(data)
resp, err := c.Send(init)
if err != nil {
return err
}
return checkOKResponse(resp)
return checkOKResponse(err, resp)
}
func Pair(c globalplatform.Channel, pairingPass string, pin string) (*lightwallet.PairingInfo, error) {
@ -82,11 +71,7 @@ func Pair(c globalplatform.Channel, pairingPass string, pin string) (*lightwalle
cmd := lightwallet.NewCommandPairFirstStep(challenge)
resp, err := c.Send(cmd)
if err != nil {
return nil, err
}
if err = checkOKResponse(resp); err != nil {
if err = checkOKResponse(err, resp); err != nil {
return nil, err
}
@ -103,11 +88,7 @@ func Pair(c globalplatform.Channel, pairingPass string, pin string) (*lightwalle
h.Write(cardChallenge)
cmd = lightwallet.NewCommandPairFinalStep(h.Sum(nil))
resp, err = c.Send(cmd)
if err != nil {
return nil, err
}
if err = checkOKResponse(resp); err != nil {
if err = checkOKResponse(err, resp); err != nil {
return nil, err
}
@ -129,11 +110,7 @@ func OpenSecureChannel(c globalplatform.Channel, appInfo *lightwallet.Applicatio
cmd := lightwallet.NewCommandOpenSecureChannel(pairingIndex, sc.RawPublicKey())
resp, err := c.Send(cmd)
if err != nil {
return err
}
if err = checkOKResponse(resp); err != nil {
if err = checkOKResponse(err, resp); err != nil {
return err
}
@ -179,7 +156,11 @@ func parseApplicationInfo(resp *apdu.Response) (*lightwallet.ApplicationInfo, er
}, nil
}
func checkOKResponse(resp *apdu.Response) error {
func checkOKResponse(err error, resp *apdu.Response) error {
if err != nil {
return err
}
return checkResponse(resp, apdu.SwOK)
}