Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
181ef532
Commit
181ef532
authored
Apr 18, 2021
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update shadowsocks-rust and add back some ciphers
Fix #2705 and #2663.
parent
44dc47fe
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
2 deletions
+5
-2
core/build.gradle.kts
core/build.gradle.kts
+1
-0
core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
.../src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
+1
-1
core/src/main/res/values/arrays.xml
core/src/main/res/values/arrays.xml
+2
-0
core/src/main/rust/shadowsocks-rust
core/src/main/rust/shadowsocks-rust
+1
-1
No files found.
core/build.gradle.kts
View file @
181ef532
...
@@ -40,6 +40,7 @@ cargo {
...
@@ -40,6 +40,7 @@ cargo {
extraCargoBuildArguments
=
listOf
(
"--bin"
,
libname
!!
)
extraCargoBuildArguments
=
listOf
(
"--bin"
,
libname
!!
)
featureSpec
.
noDefaultBut
(
arrayOf
(
featureSpec
.
noDefaultBut
(
arrayOf
(
"stream-cipher"
,
"stream-cipher"
,
"aead-cipher-extra"
,
"logging"
,
"logging"
,
"local-flow-stat"
,
"local-flow-stat"
,
"local-dns"
))
"local-dns"
))
...
...
core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
View file @
181ef532
...
@@ -56,7 +56,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
...
@@ -56,7 +56,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
}
}
// check the crypto
// check the crypto
val
deprecatedCiphers
val
deprecatedCiphers
=
arrayOf
(
"
xchacha20-ietf-poly1305"
,
"
aes-192-gcm"
,
"chacha20"
,
"salsa20"
)
=
arrayOf
(
"aes-192-gcm"
,
"chacha20"
,
"salsa20"
)
for
(
c
in
deprecatedCiphers
)
for
(
c
in
deprecatedCiphers
)
{
{
if
(
profile
.
method
==
c
)
{
if
(
profile
.
method
==
c
)
{
...
...
core/src/main/res/values/arrays.xml
View file @
181ef532
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
<item>
AES-128-GCM
</item>
<item>
AES-128-GCM
</item>
<item>
AES-256-GCM
</item>
<item>
AES-256-GCM
</item>
<item>
CHACHA20-IETF-POLY1305
</item>
<item>
CHACHA20-IETF-POLY1305
</item>
<item>
XCHACHA20-IETF-POLY1305
</item>
</string-array>
</string-array>
<string-array
name=
"enc_method_value"
translatable=
"false"
>
<string-array
name=
"enc_method_value"
translatable=
"false"
>
...
@@ -36,6 +37,7 @@
...
@@ -36,6 +37,7 @@
<item>
aes-128-gcm
</item>
<item>
aes-128-gcm
</item>
<item>
aes-256-gcm
</item>
<item>
aes-256-gcm
</item>
<item>
chacha20-ietf-poly1305
</item>
<item>
chacha20-ietf-poly1305
</item>
<item>
xchacha20-ietf-poly1305
</item>
</string-array>
</string-array>
<string-array
name=
"bypass_private_route"
translatable=
"false"
>
<string-array
name=
"bypass_private_route"
translatable=
"false"
>
...
...
shadowsocks-rust
@
9977eb72
Subproject commit
f805b5d3503e5ca0f85c22dabdeac3341618ec86
Subproject commit
9977eb724e6d257e6a570b788d91d70b432a49e0
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment