diff --git a/main.go b/main.go index c5eaef4..6f33b7f 100644 --- a/main.go +++ b/main.go @@ -24,6 +24,6 @@ func tunnel() { func main() { flag.Parse() fmt.Println("Hello World!") - log.LogTo(cli.LogTo, "DEBUG") + log.LogTo(cli.LogTo, "INFO") tunnel() } diff --git a/server.bat b/server.bat index adc2def..9ff532e 100644 --- a/server.bat +++ b/server.bat @@ -1 +1 @@ -.\TransX -destip 127.0.0.1 -destport 1315 -listenport 1082 -encrypt server -log server.log \ No newline at end of file +.\TransX -destip 127.0.0.1 -destport 1084 -listenport 1082 -encrypt server -log server.log \ No newline at end of file diff --git a/tscipher/cipher.go b/tscipher/cipher.go index 3e0441e..a8436ee 100644 --- a/tscipher/cipher.go +++ b/tscipher/cipher.go @@ -85,7 +85,7 @@ func WrapPackage(data []byte) []byte { //把要加密传输的数据打包成一 key = key cipheredHeader := make([]byte, len(header)) for i, v := range header { - cipheredHeader[i] = v //^ key[i%len(key)] + cipheredHeader[i] = v ^ key[i%len(key)] } return append(cipheredHeader, data...) } @@ -97,7 +97,7 @@ func UnwrapPackage(pacakge []byte) (data []byte, rest []byte, err error) { key := []byte("hahahehe~-1!") key = key for i, v := range cipheredHeader { - header[i] = v //^ key[i%len(key)] + header[i] = v ^ key[i%len(key)] } start := header[:4] end := header[14:] diff --git a/tscipher/xor.go b/tscipher/xor.go index 258dc39..6191cf5 100644 --- a/tscipher/xor.go +++ b/tscipher/xor.go @@ -7,9 +7,9 @@ type XOR struct { } func (this *XOR) Decrypt(data []byte) (decrypted []byte, err error) { - decrypted = data - err = nil - return + // decrypted = data + // err = nil + // return decrypted = make([]byte, len(data)) for i := 0; i < len(data); i++ { decrypted[i] = data[len(data)-i-1] ^ this.key[i%len(this.key)] @@ -20,9 +20,9 @@ func (this *XOR) Decrypt(data []byte) (decrypted []byte, err error) { } func (this *XOR) Encrypt(data []byte) (encryped []byte, err error) { - encryped = data - err = nil - return + // encryped = data + // err = nil + // return encryped = make([]byte, len(data)) for i := 0; i < len(data); i++ { encryped[len(data)-i-1] = data[i] ^ this.key[i%len(this.key)]