mirrors/SakuraFrp
1
0
Fork 0
mirror of https://github.com/ZeroDream-CN/SakuraFrp synced 2024-11-22 15:44:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix crypto

Browse Source
This commit is contained in:
Gogs 2016-03-24 15:37:40 +08:00
parent 580e75f633
commit 49975c4c1b
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,20 +175,18 @@ func PipeDecryptoReader(r net.Conn, w net.Conn, key string) {
return return
} }
log.Debug("PipeDecryptoReader") nreader := bufio.NewReader(r)
buf := make([]byte, 10*1024)
for { for {
n, err := r.Read(buf) buf, err := nreader.ReadBytes('\n')
if err != nil { if err != nil {
log.Error("Conn ReadLine error, [%v]", err) log.Error("Conn ReadBytes error, [%v]", err)
return return
} }
res, err := laes.Decrypto(buf[:n]) res, err := laes.Decrypto(buf)
if err != nil { if err != nil {
log.Error("Decrypto error, [%s] [%s]", err, string(buf[:n])) log.Error("Decrypto error, [%s] [%s]", err, string(buf))
return return
} }
@ -211,12 +209,11 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) {
return return
} }
log.Debug("PipeEncryptoWriter") nreader := bufio.NewReader(r)
buf := make([]byte, 10*1024) buf := make([]byte, 10*1024)
for { for {
n, err := r.Read(buf) n, err := nreader.Read(buf)
if err != nil { if err != nil {
log.Error("Conn ReadLine error, [%v]", err) log.Error("Conn ReadLine error, [%v]", err)
return return
@ -227,6 +224,7 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) {
return return
} }
res = append(res, '\n')
_, err = w.Write(res) _, err = w.Write(res)
if err != nil { if err != nil {
log.Error("net.Conn Write error, [%v]", err) log.Error("net.Conn Write error, [%v]", err)