修复加密key无效bug，上传二进制文件

tkzcfc · Dec 16, 2020 · 1e29c47 · 1e29c47
1 parent 193a96b
commit 1e29c47
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,6 @@
 *.a
 
 # Executables
-*.exe
 *.out
 *.app
 

diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ socks5 libuv
 
 - **client_listenIP :** 客户端监听地址
 - **client_listenPort :** 客户端监听端口
+- **remoteIP :** 远程服务器地址
 - **svr_listenIP :** 服务端监听地址
 - **svr_listenPort :** 服务器监听端口
 - **use_kcp :** 传输隧道是否使用kcp

diff --git a/bin/client.exe b/bin/client.exe
diff --git a/bin/config.json b/bin/config.json
@@ -0,0 +1,12 @@
+{
+	"client_listenIP": "0.0.0.0",
+	"svr_listenIP": "0.0.0.0",
+	"remoteIP": "127.0.0.1",
+	"client_listenPort": 8527,
+	"svr_listenPort": 1004,
+	"use_kcp": false,
+	"encry_method": "RC4",
+	"encry_key": "12@#abca",
+	"username": "",
+	"password": ""
+}
diff --git a/bin/server.exe b/bin/server.exe
diff --git a/common/Cypher.cpp b/common/Cypher.cpp
@@ -7,7 +7,7 @@ Cypher::Cypher(EncryMethod  method, const char* key, uint32_t keyLen)
 	m_cacheBuf = NULL;
 	m_cacheLen = 0;
 
-	if(m_keyLen == 0)
+	if(keyLen == 0)
 	{
 		const char* defaultKey = "12@#";
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ @@
     *.a
     # Executables
-    *.exe
     *.out
     *.app
@@ Expand Down @@