mirror of https://github.com/schollz/croc.git
bug fixes
This commit is contained in:
parent
c3c892f95d
commit
f68e194a4a
|
@ -166,8 +166,9 @@ func (s *server) clientCommunication(port string, c *comm.Comm) (room string, er
|
||||||
}
|
}
|
||||||
// check whether we have a valid public key from client
|
// check whether we have a valid public key from client
|
||||||
keyPublic := string(retBytes)
|
keyPublic := string(retBytes)
|
||||||
_, err := age.ParseX25519Recipient(keyPublic)
|
_, err = age.ParseX25519Recipient(keyPublic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
err = fmt.Errorf("bad public key: %s", keyPublic)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,7 +258,7 @@ func (s *server) clientCommunication(port string, c *comm.Comm) (room string, er
|
||||||
}(otherConnection, c, &wg)
|
}(otherConnection, c, &wg)
|
||||||
|
|
||||||
// tell the sender everything is ready
|
// tell the sender everything is ready
|
||||||
bSend, err = crypt.Encrypt([]byte("ok"), strongKeyForEncryption)
|
bSend, err = crypt.EncryptAge([]byte("ok"), keyPublic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -384,7 +385,7 @@ func ConnectToTCPServer(address, password, room string, timelimit ...time.Durati
|
||||||
|
|
||||||
// send epheremal public key, encrypted using the server's public key
|
// send epheremal public key, encrypted using the server's public key
|
||||||
foo := strings.Split(password, "--")
|
foo := strings.Split(password, "--")
|
||||||
keyPublicRelay = foo[1]
|
keyPublicRelay := foo[1]
|
||||||
password = foo[2]
|
password = foo[2]
|
||||||
|
|
||||||
sendBytesEnc, err := crypt.EncryptAge([]byte(keyPublic), keyPublicRelay)
|
sendBytesEnc, err := crypt.EncryptAge([]byte(keyPublic), keyPublicRelay)
|
||||||
|
@ -412,7 +413,7 @@ func ConnectToTCPServer(address, password, room string, timelimit ...time.Durati
|
||||||
ipaddr = strings.Split(string(retBytes), "|||")[1]
|
ipaddr = strings.Split(string(retBytes), "|||")[1]
|
||||||
|
|
||||||
log.Debug("sending room")
|
log.Debug("sending room")
|
||||||
bSend, err = crypt.EncryptAge([]byte(room), keyPublicRelay)
|
bSend, err := crypt.EncryptAge([]byte(room), keyPublicRelay)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -421,11 +422,11 @@ func ConnectToTCPServer(address, password, room string, timelimit ...time.Durati
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log.Debug("waiting for room confirmation")
|
log.Debug("waiting for room confirmation")
|
||||||
enc, err = c.Receive()
|
enc, err := c.Receive()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
data, err = crypt.DecryptAge(enc, keyPrivate)
|
data, err := crypt.DecryptAge(enc, keyPrivate)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue