mirrors_public/schollz_croc
0
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

fix

Browse source
This commit is contained in:
Zack 2024-05-23 09:34:17 -07:00
parent 43f1c53538
commit 8e10eac5c5
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/croc/croc.go
View file

@ -710,15 +710,15 @@ func (c *Client) Send(filesInfo []FileInfo, emptyFoldersToTransfer []FileInfo, t
if errConn != nil { if errConn != nil {
log.Debugf("[%+v] had error: %s", conn, errConn.Error()) log.Debugf("[%+v] had error: %s", conn, errConn.Error())
} }
err = json.Unmarshal(data, &dataMessage) json.Unmarshal(data, &dataMessage)
if err == nil { log.Debugf("dataMessage: %s", dataMessage)
log.Debugf("dataMessage: %s", dataMessage) log.Debugf("kB: %x", kB)
}
// if kB not null, then use it to decrypt // if kB not null, then use it to decrypt
if kB != nil { if kB != nil {
data, err = crypt.Decrypt(data, kB) var decryptErr error
if err != nil { data, decryptErr = crypt.Decrypt(data, kB)
log.Debugf("error decrypting: %v", err) if decryptErr != nil {
log.Debugf("error decrypting: %v", decryptErr)
} }
} }
if bytes.Equal(data, ipRequest) { if bytes.Equal(data, ipRequest) {
@ -740,15 +740,16 @@ func (c *Client) Send(filesInfo []FileInfo, emptyFoldersToTransfer []FileInfo, t
log.Errorf("error sending: %v", err) log.Errorf("error sending: %v", err)
} }
} else if dataMessage.Kind == "pake1" { } else if dataMessage.Kind == "pake1" {
err = B.Update(dataMessage.Bytes) var pakeError error
if err == nil { pakeError = B.Update(dataMessage.Bytes)
kB, err = B.SessionKey() if pakeError == nil {
if err == nil { kB, pakeError = B.SessionKey()
if pakeError == nil {
log.Debugf("dataMessage kB: %x", kB) log.Debugf("dataMessage kB: %x", kB)
dataMessage.Bytes = B.Bytes() dataMessage.Bytes = B.Bytes()
dataMessage.Kind = "pake2" dataMessage.Kind = "pake2"
data, _ = json.Marshal(dataMessage) data, _ = json.Marshal(dataMessage)
if err = conn.Send(data); err != nil { if pakeError = conn.Send(data); err != nil {
log.Errorf("dataMessage error sending: %v", err) log.Errorf("dataMessage error sending: %v", err)
} }
} }