Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #337 from alrs/alrs-fix-server-nil-salt-and-keys 

src/tcp: fix dropped errors
This commit is contained in:
Zack 2021-03-10 08:16:19 -08:00 committed by GitHub
parent cd6d9a5aa0 a9487a332c
commit 6e9156d49c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tcp/tcp.go
View File

@ -170,6 +170,9 @@ func (s *server) clientCommunication(port string, c *comm.Comm) (room string, er
return
}
err = c.Send(B.Bytes())
if err != nil {
return
}
Abytes, err = c.Receive()
if err != nil {
return
@ -186,6 +189,9 @@ func (s *server) clientCommunication(port string, c *comm.Comm) (room string, er
// receive salt
salt, err := c.Receive()
if err != nil {
return
}
strongKeyForEncryption, _, err := crypt.New(strongKey, salt)
if err != nil {
return
@ -446,6 +452,9 @@ func ConnectToTCPServer(address, password, room string, timelimit ...time.Durati
log.Debugf("strong key: %x", strongKey)
strongKeyForEncryption, salt, err := crypt.New(strongKey, nil)
if err != nil {
return
}
// send salt
err = c.Send(salt)
if err != nil {