cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crypto

Browse Source
This commit is contained in:
Gogs 2016-03-23 11:14:13 +08:00
parent 20afe25ef1
commit d3cb149cc4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frp/utils/conn/conn.go
View File

@ -175,23 +175,22 @@ func PipeDecryptoReader(r net.Conn, w net.Conn, key string) {
return
}
log.Debug("PipeDecryptoReader")
buf := make([]byte, 10*1024)
nreader := bufio.NewReader(r)
for {
n, err := r.Read(buf)
buf, err := nreader.ReadBytes('\n')
if err != nil {
log.Error("Conn ReadLine error, [%v]", err)
log.Error("Conn ReadBytes error, [%v]", err)
return
}
res, err := laes.Decrypto(buf[:n])
res, err := laes.Decrypto(buf)
if err != nil {
log.Error("Decrypto error, [%s] [%s]", err, string(buf[:n]))
log.Error("Decrypto error, [%s] [%s]", err, string(buf))
return
}
// res = append(res, '\n')
_, err = w.Write(res)
if err != nil {
log.Error("net.Conn Write error, [%v]", err)
@ -213,20 +212,21 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) {
log.Debug("PipeEncryptoWriter")
buf := make([]byte, 10*1024)
nreader := bufio.NewReader(r)
for {
n, err := r.Read(buf)
buf, err := nreader.ReadBytes('\n')
if err != nil {
log.Error("Conn ReadLine error, [%v]", err)
return
}
res, err := laes.Encrypto(buf[:n])
res, err := laes.Encrypto(buf)
if err != nil {
log.Error("Encrypto error, [%v]", err)
return
}
res = append(res, '\n')
_, err = w.Write(res)
if err != nil {
log.Error("net.Conn Write error, [%v]", err)