Skip to content

firmware: return errors instead of panicking in Noise pairing #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
strmci wants to merge 1 commit into
base: master
Choose a base branch
from
Open

firmware: return errors instead of panicking in Noise pairing #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions api/firmware/pairing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (device *Device) pair() error {
device.log.Info("noise static keypair created")
kp, err := cipherSuite.GenerateKeypair(rand.Reader)
if err != nil {
panic(err)
return err
}
keypair = &kp
if err := device.config.SetAppNoiseStaticKeypair(keypair); err != nil {
Expand All @@ -53,31 +53,31 @@ func (device *Device) pair() error {
Initiator: true,
})
if err != nil {
panic(err)
return err
}
responseBytes, err := device.rawQuery([]byte(opICanHasHandShaek))
if err != nil {
return err
}
if string(responseBytes) != responseSuccess {
panic(string(responseBytes))
return errp.Newf("unexpected handshake start response: %x", responseBytes)
}
// do handshake:
msg, _, _, err := handshake.WriteMessage(nil, nil)
if err != nil {
panic(err)
return err
}
responseBytes, err = device.handshakeQuery(msg)
if err != nil {
return err
}
_, _, _, err = handshake.ReadMessage(nil, responseBytes)
if err != nil {
panic(err)
return err
}
msg, device.sendCipher, device.receiveCipher, err = handshake.WriteMessage(nil, nil)
if err != nil {
panic(err)
return err
}
responseBytes, err = device.handshakeQuery(msg)
if err != nil {
Expand All @@ -86,7 +86,7 @@ func (device *Device) pair() error {

device.deviceNoiseStaticPubkey = handshake.PeerStatic()
if len(device.deviceNoiseStaticPubkey) != 32 {
panic(errp.New("expected 32 byte remote static pubkey"))
return errp.New("expected 32 byte remote static pubkey")
}

pairingVerificationRequiredByApp := !device.options.optionalNoisePairingConfirmation && !device.config.ContainsDeviceStaticPubkey(device.deviceNoiseStaticPubkey)
Expand Down