AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #515 from amnezia-vpn/fix/android-wg

Browse source 
set wg PresharedKey parameter as optional
This commit is contained in:
pokamest 2024-01-20 09:16:16 -08:00 • committed by GitHub
commit 0f9ed4e69c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/WireguardConfig.kt
View file

@ -11,7 +11,7 @@ open class WireguardConfig protected constructor(
val endpoint: InetEndpoint, val endpoint: InetEndpoint,
val persistentKeepalive: Int, val persistentKeepalive: Int,
val publicKeyHex: String, val publicKeyHex: String,
val preSharedKeyHex: String, val preSharedKeyHex: String?,
val privateKeyHex: String val privateKeyHex: String
) : ProtocolConfig(protocolConfigBuilder) { ) : ProtocolConfig(protocolConfigBuilder) {
@ -43,7 +43,8 @@ open class WireguardConfig protected constructor(
appendLine("endpoint=$endpoint") appendLine("endpoint=$endpoint")
if (persistentKeepalive != 0) if (persistentKeepalive != 0)
appendLine("persistent_keepalive_interval=$persistentKeepalive") appendLine("persistent_keepalive_interval=$persistentKeepalive")
appendLine("preshared_key=$preSharedKeyHex") if (preSharedKeyHex != null)
appendLine("preshared_key=$preSharedKeyHex")
} }
open class Builder : ProtocolConfig.Builder(true) { open class Builder : ProtocolConfig.Builder(true) {
@ -56,7 +57,7 @@ open class WireguardConfig protected constructor(
internal lateinit var publicKeyHex: String internal lateinit var publicKeyHex: String
private set private set
internal lateinit var preSharedKeyHex: String internal var preSharedKeyHex: String? = null
private set private set
internal lateinit var privateKeyHex: String internal lateinit var privateKeyHex: String