AEAD supported.

ShadowsocksR-Live · Dec 18, 2021 · e7f55ec · e7f55ec
1 parent dddfecb
commit e7f55ec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/depends/ssr-native b/depends/ssr-native
diff --git a/depends/zbar b/depends/zbar
diff --git a/src/ssrWin.sln b/src/ssrWin.sln
@@ -30,6 +30,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssr-client-lib", "..\depend
 		{46CF2D25-6A36-4189-B59C-E4815388E554} = {46CF2D25-6A36-4189-B59C-E4815388E554}
 		{44EA013F-AD0F-4D53-8E06-0B4EF26F4B65} = {44EA013F-AD0F-4D53-8E06-0B4EF26F4B65}
 		{A185B162-6CB6-4502-B03F-B56F7699A8D9} = {A185B162-6CB6-4502-B03F-B56F7699A8D9}
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85} = {FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}
 		{E683C8F1-3C3F-4B5D-B60E-87D792D21002} = {E683C8F1-3C3F-4B5D-B60E-87D792D21002}
 	EndProjectSection
 EndProject
@@ -44,6 +45,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zbar", "..\depends\zbar\win
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\depends\zbar\libiconv\win32\libiconv.vcxproj", "{F8837083-04B2-3D79-96DC-D36A40C5D304}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bloom", "..\depends\ssr-native\depends\libbloom\win32\bloom.vcxproj", "{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -148,6 +151,14 @@ Global
 		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Release|Win32.Build.0 = Release|Win32
 		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Release|x64.ActiveCfg = Release|x64
 		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Release|x64.Build.0 = Release|x64
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}.Debug|Win32.Build.0 = Debug|Win32
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}.Debug|x64.ActiveCfg = Debug|x64
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}.Debug|x64.Build.0 = Debug|x64
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}.Release|Win32.ActiveCfg = Release|Win32
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}.Release|Win32.Build.0 = Release|Win32
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}.Release|x64.ActiveCfg = Release|x64
+		{FCBB48D0-3186-4EC7-A2D9-C54A2BCF0B85}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
+40 −0		.github/workflows/cmake.yml
+5 −0		.gitmodules
+1 −0		CMakeLists.txt
+5 −3		README.md
+1 −1		depends/json-c
+1 −0		depends/libbloom
+1 −1		depends/libuv
+1 −1		depends/mbedtls
+1 −1		depends/uv-mbed
+7 −2		install/ssrn-install.sh
+1 −0		install/ssrn-ot-install.sh
+6 −0		src/CMakeLists.txt
+1,262 −0		src/aead.c
+104 −0		src/aead.h
+13 −18		src/android.c
+59 −42		src/client/client.c
+10 −4		src/client/listener.c
+46 −12		src/client/main.c
+5 −5		src/client/tls_cli2.c
+26 −7		src/cmd_line_parser.c
+3 −2		src/cmd_line_parser.h
+2 −2		src/common.h
+154 −63		src/encrypt.c
+80 −80		src/obfs/auth.c
+48 −42		src/obfs/auth_chain.c
+30 −30		src/obfs/http_simple.c
+4 −0		src/obfs/obfs.h
+110 −110		src/obfs/tls1.2_ticket.c
+101 −0		src/ppbloom.c
+31 −0		src/ppbloom.h
+50 −32		src/server/server.c
+10 −1		src/ssr_cipher_names.c
+5 −0		src/ssr_cipher_names.h
+24 −10		src/ssr_executive.c
+1 −1		src/ssr_executive.h
+23 −19		src/ssrbuffer.c
+9 −7		src/ssrbuffer.h
+1 −2		src/ssrutils.h
+7 −1		src/tunnel.c
+4 −2		src/udprelay.c
+12 −8		win32/ssr-client/ssr-client-lib.vcxproj
+15 −0		win32/ssr-client/ssr-client-lib.vcxproj.filters
+12 −8		win32/ssr-client/ssr-client.vcxproj
+15 −0		win32/ssr-client/ssr-client.vcxproj.filters
+10 −0		win32/ssr-native-lib.sln
+12 −0		win32/ssr-native.sln
+12 −8		win32/ssr-server/ssr-server.vcxproj
+15 −0		win32/ssr-server/ssr-server.vcxproj.filters