PIA-1960: Update OpenVPN and update its whitelist parameters to allow…

… for pia specific ones (#11)
pia-foss · Jun 26, 2024 · 20f5c3e · 20f5c3e
1 parent 60e5a32
commit 20f5c3e
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 2 deletions.
diff --git a/...vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/arm64-v8a/libopenvpn-executable.so b/...vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/arm64-v8a/libopenvpn-executable.so
diff --git a/vpnmanager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/arm64-v8a/libopenvpn.so b/vpnmanager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/arm64-v8a/libopenvpn.so
diff --git a/...nservicemanager/vpnprotocol/openvpn/src/main/jniLibs/armeabi-v7a/libopenvpn-executable.so b/...nservicemanager/vpnprotocol/openvpn/src/main/jniLibs/armeabi-v7a/libopenvpn-executable.so
diff --git a/vpnmanager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/armeabi-v7a/libopenvpn.so b/vpnmanager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/armeabi-v7a/libopenvpn.so
diff --git a/...nager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/x86/libopenvpn-executable.so b/...nager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/x86/libopenvpn-executable.so
diff --git a/vpnmanager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/x86/libopenvpn.so b/vpnmanager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/x86/libopenvpn.so
diff --git a/...er/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/x86_64/libopenvpn-executable.so b/...er/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/x86_64/libopenvpn-executable.so
diff --git a/vpnmanager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/x86_64/libopenvpn.so b/vpnmanager/vpnservicemanager/vpnprotocol/openvpn/src/main/jniLibs/x86_64/libopenvpn.so
diff --git a/...c/main/java/com/kape/vpnprotocol/domain/usecases/openvpn/FilterAdditionalOpenVpnParams.kt b/...c/main/java/com/kape/vpnprotocol/domain/usecases/openvpn/FilterAdditionalOpenVpnParams.kt
@@ -115,7 +115,10 @@ internal class FilterAdditionalOpenVpnParams : IFilterAdditionalOpenVpnParams {
             "--topology",
             "--tun-mtu",
             "--tun-mtu-extra",
-            "--windows-driver"
+            "--windows-driver",
+            "--cipher",
+            "--pia-signal-settings",
+            "--ncp-disable"
         )
     }
 }
diff --git a/...col/src/main/java/com/kape/vpnprotocol/domain/usecases/openvpn/GenerateOpenVpnSettings.kt b/...col/src/main/java/com/kape/vpnprotocol/domain/usecases/openvpn/GenerateOpenVpnSettings.kt
@@ -86,13 +86,17 @@ internal class GenerateOpenVpnSettings(
             "--data-ciphers", dataCiphers,
             "--auth", "SHA256",
             "--auth-nocache",
-            "--explicit-exit-notify", "2",
             "--script-security", "2",
             "--remote-cert-tls", "server",
             "--verb", "3",
             "--mute-replay-warnings"
         )
 
+        if (protocolConfiguration.openVpnClientConfiguration.server.transport == VPNTransportProtocol.UDP) {
+            commandLineParams.add("--explicit-exit-notify")
+            commandLineParams.add("2")
+        }
+
         commandLineParams.addAll(protocolConfiguration.openVpnClientConfiguration.additionalParameters.split("\\s+".toRegex()).filter { it.isNotBlank() })
 
         protocolConfiguration.openVpnClientConfiguration.socksProxy?.let {