From 3e5b876a32276ecf1d68e3ede0a891ba3a7dc427 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Tue, 9 Mar 2021 16:55:42 -0800 Subject: [PATCH] src/croc: fix dropped errors --- src/croc/croc.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/croc/croc.go b/src/croc/croc.go index 478c9b6a..3d47ab1d 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -800,6 +800,9 @@ func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error Type: "error", Message: "refusing files", }) + if err != nil { + return false, err + } return true, fmt.Errorf("refused files") } } else { @@ -893,6 +896,9 @@ func (c *Client) processMessageSalt(m message.Message) (done bool, err error) { Type: "salt", Bytes: m.Bytes, }) + if err != nil { + return true, err + } } log.Debugf("session key is verified, generating encryption with salt: %x", m.Bytes) key, err := c.Pake.SessionKey() @@ -994,7 +1000,6 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) { Message: "refusing files", }) done = true - err = fmt.Errorf("refused files") return } }