use default password

This commit is contained in:
Michele Balistreri 2022-02-07 16:19:32 +01:00
parent 872cadb62f
commit 62e33e6b26
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
2 changed files with 17 additions and 17 deletions

View File

@ -46,19 +46,23 @@ func (f *KeycardFlow) pair(kc *keycardContext) error {
return f.pauseAndRestart(SwapCard, FreeSlots) return f.pauseAndRestart(SwapCard, FreeSlots)
} }
if pairingPass, ok := f.params[PairingPass]; ok { pairingPass, ok := f.params[PairingPass]
pairing, err := kc.pair(pairingPass.(string))
if err == nil { if !ok {
return f.pairings.store(f.cardInfo.instanceUID, toPairInfo(pairing)) pairingPass = DefPairing
} else if isSCardError(err) {
return restartErr()
}
delete(f.params, PairingPass)
} }
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 { if err != nil {
return err return err
@ -91,12 +95,7 @@ func (f *KeycardFlow) initCard(kc *keycardContext) error {
newPairing, pairingOK := f.params[NewPairing] newPairing, pairingOK := f.params[NewPairing]
if !pairingOK { if !pairingOK {
err := f.pauseAndWait(EnterNewPair, ErrorRequireInit) newPairing = DefPairing
if err != nil {
return err
}
return f.initCard(kc)
} }
err := kc.init(newPIN.(string), newPUK.(string), newPairing.(string)) err := kc.init(newPIN.(string), newPUK.(string), newPairing.(string))

View File

@ -91,7 +91,8 @@ const (
PUKRetries = "puk-retries" PUKRetries = "puk-retries"
PairingPass = "pairing-pass" PairingPass = "pairing-pass"
Paired = "paired" Paired = "paired"
NewPairing = "new- pairing-pass" NewPairing = "new-pairing-pass"
DefPairing = "KeycardDefaultPairing"
PIN = "pin" PIN = "pin"
NewPIN = "new-pin" NewPIN = "new-pin"
PUK = "puk" PUK = "puk"