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

add delete and load package methods to gp command set

This commit is contained in:
Andrea Franz 2019-03-14 14:13:57 +01:00
parent d8a6a41ca7
commit 5f23138b45
No known key found for this signature in database
GPG Key ID: 4F0D2F2D9DE7F29D
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
globalplatform/command_set.go
View File

@ -75,10 +75,9 @@ func (cs *CommandSet) DeleteKeycardInstancesAndPackage() error {
identifiers.PackageAID,
}
for _, id := range ids {
cmd := NewCommandDelete(id)
resp, err := cs.sc.Send(cmd)
if cs.checkOK(resp, err, SwOK, SwReferencedDataNotFound) != nil {
for _, aid := range ids {
err := cs.Delete(aid)
if err != nil {
return err
}
}
@ -86,12 +85,22 @@ func (cs *CommandSet) DeleteKeycardInstancesAndPackage() error {
return nil
}
func (cs *CommandSet) Delete(aid []byte) error {
cmd := NewCommandDelete(aid)
resp, err := cs.sc.Send(cmd)
return cs.checkOK(resp, err, SwOK, SwReferencedDataNotFound)
}
func (cs *CommandSet) LoadKeycardPackage(capFile *os.File, callback LoadingCallback) error {
return cs.LoadPackage(capFile, identifiers.PackageAID, callback)
}
func (cs *CommandSet) LoadPackage(capFile *os.File, pkgAID []byte, callback LoadingCallback) error {
if cs.sc == nil {
return ErrSecureChannelNotOpen
}
preLoad := NewCommandInstallForLoad(identifiers.PackageAID, []byte{})
preLoad := NewCommandInstallForLoad(pkgAID, []byte{})
resp, err := cs.sc.Send(preLoad)
if err = cs.checkOK(resp, err); err != nil {
return err
@ -115,7 +124,7 @@ func (cs *CommandSet) LoadKeycardPackage(capFile *os.File, callback LoadingCallb
}
func (cs *CommandSet) InstallNDEFApplet(ndefRecord []byte) error {
return cs.installForInstall(
return cs.InstallForInstall(
identifiers.PackageAID,
identifiers.NdefAID,
identifiers.NdefInstanceAID,
@ -128,14 +137,14 @@ func (cs *CommandSet) InstallKeycardApplet() error {
return err
}
return cs.installForInstall(
return cs.InstallForInstall(
identifiers.PackageAID,
identifiers.KeycardAID,
instanceAID,
[]byte{})
}
func (cs *CommandSet) installForInstall(packageAID, appletAID, instanceAID, params []byte) error {
func (cs *CommandSet) InstallForInstall(packageAID, appletAID, instanceAID, params []byte) error {
cmd := NewCommandInstallForInstall(packageAID, appletAID, instanceAID, params)
resp, err := cs.sc.Send(cmd)
return cs.checkOK(resp, err)