Merge branch 'add-wg-nt-daita'

Author: dlon

.github/workflows/daemon.yml

@@ -114,6 +114,10 @@ jobs:
       - name: Checkout submodules
         run: git submodule update --init --depth=1
 
+      - name: Checkout wireguard-nt
+        working-directory: dist-assets/binaries
+        run: git submodule update --init -- wireguard-nt
+
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
         with:

Cargo.lock

@@ -12,6 +12,7 @@ members = [
     "ios/MullvadREST/Transport/Shadowsocks/shadowsocks-proxy",
     "ios/TunnelObfuscation/tunnel-obfuscator-proxy",
     "mullvad-api",
+    "mullvad-daemon",
     "mullvad-cli",
     "mullvad-daemon",
     "mullvad-exclude",

Cargo.toml

@@ -0,0 +1,4 @@
+789cd5cfbb0900200c04d08b833886adb889389f5bb9801be811acb58ae2837ce02010c158b070555c9538b6377a64dbb0ceff242c20b79038507dd169fbede9f629bf6f021efa1b66
+789cedd0510a401110856153f665ffbbb1030e991735717890f8eabae22f35e252e31a6c2b6c2bf158ce88010b61b69fed14db7fabd8498ffad17d8fedbf5decc4adde3ab7b0fddb045fa153d3ff09ecdb6c7faf0cd04322e8
+789cedd1510a80200c80617de95addff36dda096e84b209bfe0f1bb40f32297f1056cbdd954eb68d6c9b7ac8e2e33a650176fbdd6ea07df24227b7daaf9effa27df2462768edade766689fa2a093d47aedbf86f6291a3ad1593ffb6e45fb4454795e630ae31d11bd1bedffeb0151b22c62
+789cedd2bd4b82411c07f07b2a48846a089a326889861a9c2452ee12221e0ca2a5201ca5a122fc0bda042544370771f3159c9c0405e51914e45c5414df7d441075f00515c4c553f0117906075f40f0331c77c7ddef8efb1e05a6de8e6f3d96661392ee1c6a9f349b72e6316a6e542c4c980b5dbb24cfbbcccefa1d00d57df145ff44079506a677adacc29623a4780f30288a312e99440f809a7d9b457c4711a1b8cf7249ea2adf75cb698e1b4fb50f19dc4d67e0c95d12d354186ab3b1e74f5b9ab7aecc4e70f332e918bfdef6db03ce9042a2bba491e88324629022ef85a6f1aa95a3ece0efcb5f5223012039997e3b726455cb84a9f82322db96f6ff531dbada6558bb120bdce79915bf6c6bc5f51659febc1141265ee0

dist-assets/binaries

@@ -200,7 +200,7 @@ WireGuard tunnel to the relay and deriving the PSK within the tunnel.
 The PSK is stored in memory on the relay and the client, along with a new client generated ephemeral
 WireGuard key. Subsequently, a new tunnel is created using the new WireGuard key and the PSK,
 ensuring that the tunnel is quantum-resistant.
-See the [protocol definition file](../talpid-tunnel-config-client/proto/tunnel_config.proto) for
+See the [protocol definition file](../talpid-tunnel-config-client/proto/ephemeralpeer.proto) for
 more details on the protocol.
 
 #### Quantum-resistant tunnels & Multihop

dist-assets/maybenot_machines

@@ -630,6 +630,12 @@ msgctxt "connect-view"
 msgid "You’re all set!"
 msgstr ""
 
+#. %(hostname)s - The current server the app is connected to, e.g. "se-got-wg-001 using DAITA"
+#. %(daita)s - Will be replaced with "DAITA"
+msgctxt "connection-info"
+msgid "%(hostname)s using %(daita)s"
+msgstr ""
+
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
@@ -1368,6 +1374,10 @@ msgctxt "select-location-view"
 msgid "Relay"
 msgstr ""
 
+msgctxt "select-location-view"
+msgid "Setting: %(settingName)s"
+msgstr ""
+
 msgctxt "select-location-view"
 msgid "The app selects a random bridge server, but servers have a higher probability the closer they are to you."
 msgstr ""
@@ -1980,12 +1990,20 @@ msgctxt "wireguard-settings-nav"
 msgid "%(wireguard)s settings"
 msgstr ""
 
+msgctxt "wireguard-settings-view"
+msgid "%(daita)s (%(daitaFull)s) hides patterns in your encrypted VPN traffic. If anyone is monitoring your connection, this makes it significantly harder for them to identify what websites you are visiting. It does this by carefully adding network noise and making all network packets the same size."
+msgstr ""
+
 #. Available placeholders:
 #. %(wireguard)s - Will be replaced with the string "WireGuard"
 msgctxt "wireguard-settings-view"
 msgid "%(wireguard)s settings"
 msgstr ""
 
+msgctxt "wireguard-settings-view"
+msgid "Attention: Since this increases your total network traffic, be cautious if you have a limited data plan. It can also negatively impact your network speed. Please consider this if you want to enable %(daita)s."
+msgstr ""
+
 msgctxt "wireguard-settings-view"
 msgid "IP version"
 msgstr ""
@@ -2045,6 +2063,11 @@ msgctxt "wireguard-settings-view"
 msgid "This allows access to %(wireguard)s for devices that only support IPv6."
 msgstr ""
 
+#. Warning text in a dialog that is displayed after a setting is toggled.
+msgctxt "wireguard-settings-view"
+msgid "This feature isn't available on all servers. You might need to change location after enabling."
+msgstr ""
+
 msgctxt "wireguard-settings-view"
 msgid "This feature makes the WireGuard tunnel resistant to potential attacks from quantum computers."
 msgstr ""

docs/architecture.md

@@ -41,6 +41,8 @@
   "strings": {
     "wireguard": "WireGuard",
     "openvpn": "OpenVPN",
-    "splitTunneling": "Split tunneling"
+    "splitTunneling": "Split tunneling",
+    "daita": "DAITA",
+    "daitaFull": "Defence against AI-guided Traffic Analysis"
   }
 }