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
71ed0a1e
Commit
71ed0a1e
authored
Jan 11, 2021
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #2301
parent
f9aa478d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
.../src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
+8
-6
core/src/main/rust/shadowsocks-rust
core/src/main/rust/shadowsocks-rust
+1
-1
No files found.
core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
View file @
71ed0a1e
...
@@ -46,7 +46,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
...
@@ -46,7 +46,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
suspend
fun
init
(
service
:
BaseService
.
Interface
)
{
suspend
fun
init
(
service
:
BaseService
.
Interface
)
{
// it's hard to resolve DNS on a specific interface so we'll do it here
// it's hard to resolve DNS on a specific interface so we'll do it here
if
(
profile
.
host
.
parseNumericAddress
()
==
null
)
{
if
(
profile
.
host
.
parseNumericAddress
()
==
null
&&
profile
.
plugin
!=
null
)
{
profile
.
host
=
try
{
profile
.
host
=
try
{
service
.
resolver
(
profile
.
host
).
firstOrNull
()
service
.
resolver
(
profile
.
host
).
firstOrNull
()
}
catch
(
e
:
IOException
)
{
}
catch
(
e
:
IOException
)
{
...
@@ -54,11 +54,13 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
...
@@ -54,11 +54,13 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
}
?.
hostAddress
?:
throw
UnknownHostException
()
}
?.
hostAddress
?:
throw
UnknownHostException
()
}
}
// check the crypto
// check the crypto
if
(
profile
.
method
==
"xchacha20-ietf-poly1305"
)
{
val
deprecatedCiphers
throw
IllegalArgumentException
(
"cipher xchacha20-ietf-poly1305 is deprecated."
)
=
arrayOf
(
"xchacha20-ietf-poly1305"
,
"aes-192-gcm"
,
"chacha20"
,
"salsa20"
)
}
for
(
c
in
deprecatedCiphers
)
if
(
profile
.
method
==
"aes-192-gcm"
)
{
{
throw
IllegalArgumentException
(
"cipher aes-192-gcm is deprecated."
)
if
(
profile
.
method
==
c
)
{
throw
IllegalArgumentException
(
"cipher $c is deprecated."
)
}
}
}
}
}
...
...
shadowsocks-rust
@
1ac8e2fd
Subproject commit
9000b31ffb9805324719ff5ba57c9338e357d1f0
Subproject commit
1ac8e2fd5059eb92d6d6bc8d3d66ad423cb7cb05
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