mirror of
https://github.com/status-im/status-keycard-go.git
synced 2025-02-24 12:08:38 +00:00
use default password
This commit is contained in:
parent
872cadb62f
commit
62e33e6b26
@ -46,19 +46,23 @@ func (f *KeycardFlow) pair(kc *keycardContext) error {
|
||||
return f.pauseAndRestart(SwapCard, FreeSlots)
|
||||
}
|
||||
|
||||
if pairingPass, ok := f.params[PairingPass]; ok {
|
||||
pairing, err := kc.pair(pairingPass.(string))
|
||||
pairingPass, ok := f.params[PairingPass]
|
||||
|
||||
if err == nil {
|
||||
return f.pairings.store(f.cardInfo.instanceUID, toPairInfo(pairing))
|
||||
} else if isSCardError(err) {
|
||||
return restartErr()
|
||||
}
|
||||
|
||||
delete(f.params, PairingPass)
|
||||
if !ok {
|
||||
pairingPass = DefPairing
|
||||
}
|
||||
|
||||
err := f.pauseAndWait(EnterPairing, ErrorPairing)
|
||||
pairing, err := kc.pair(pairingPass.(string))
|
||||
|
||||
if err == nil {
|
||||
return f.pairings.store(f.cardInfo.instanceUID, toPairInfo(pairing))
|
||||
} else if isSCardError(err) {
|
||||
return restartErr()
|
||||
}
|
||||
|
||||
delete(f.params, PairingPass)
|
||||
|
||||
err = f.pauseAndWait(EnterPairing, ErrorPairing)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
@ -91,12 +95,7 @@ func (f *KeycardFlow) initCard(kc *keycardContext) error {
|
||||
|
||||
newPairing, pairingOK := f.params[NewPairing]
|
||||
if !pairingOK {
|
||||
err := f.pauseAndWait(EnterNewPair, ErrorRequireInit)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return f.initCard(kc)
|
||||
newPairing = DefPairing
|
||||
}
|
||||
|
||||
err := kc.init(newPIN.(string), newPUK.(string), newPairing.(string))
|
||||
|
@ -91,7 +91,8 @@ const (
|
||||
PUKRetries = "puk-retries"
|
||||
PairingPass = "pairing-pass"
|
||||
Paired = "paired"
|
||||
NewPairing = "new- pairing-pass"
|
||||
NewPairing = "new-pairing-pass"
|
||||
DefPairing = "KeycardDefaultPairing"
|
||||
PIN = "pin"
|
||||
NewPIN = "new-pin"
|
||||
PUK = "puk"
|
||||
|
Loading…
x
Reference in New Issue
Block a user