Merge branch 'hotfix/3.5.x' into bugfix/revert-3.4.1

Author: keeshux

.github/workflows/manual_release.yml

@@ -52,8 +52,9 @@ jobs:
           git_push_gpgsign: false
       - name: Tag release
         run: |
-          git tag -as "v$APP_VERSION" -m "v$APP_VERSION"
-          git push --tags
+          tag="v$APP_VERSION"
+          git tag -as "$tag" -m "$tag"
+          git push origin "$tag"
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:

.github/workflows/release.yml

@@ -214,8 +214,9 @@ jobs:
           git_push_gpgsign: false
       - name: Tag release
         run: |
-          git tag -as "v$APP_VERSION" -m "v$APP_VERSION"
-          git push --tags
+          tag="v$APP_VERSION"
+          git tag -as "$tag" -m "$tag"
+          git push origin "$tag"
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:

.github/workflows/test.yml

@@ -3,6 +3,9 @@ name: SwiftPM Tests
 on:
   pull_request:
     types: [ opened, synchronize ]
+    branches:
+      - "master"
+      - "hotfix/*"
     paths-ignore:
       - "README.md"
       - ".env.*"

CHANGELOG.txt

@@ -1,3 +1,2 @@
-* Auto-delete stale keychain entries
-* Restore auto-deletion of migrated v2 profiles
-* Extend the eligibility for the "Forever" product (#1377)
+* Update Partout with new OpenSSL/WireGuard versions (#1449)
+* OpenVPN: Improve poor XOR performance by 30x

Packages/App/Sources/CommonLibrary/IAP/AppFeatureProviding+Products.swift

@@ -69,11 +69,7 @@ extension AppProduct: AppFeatureProviding {
             // should now see their artificial in-app purchase propagated
             // to the tvOS app
             //
-            var eligible: [AppFeature] = [.appleTV, .sharing]
-#if os(tvOS)
-            eligible.append(contentsOf: AppFeature.essentialFeatures)
-#endif
-            return eligible
+            return [.appleTV, .sharing]
 
         case .Complete.OneTime.lifetime, .Complete.Recurring.monthly, .Complete.Recurring.yearly:
             return AppFeature.allCases

Packages/App/Sources/StringsLibrary/Resources/de.lproj/Localizable.strings

@@ -48,6 +48,40 @@
 "errors.tunnel.routing" = "Routing fehlt";
 "errors.tunnel.shutdown" = "Server heruntergefahren";
 "errors.tunnel.tls" = "TLS fehlgeschlagen";
+"errors.wireguard.interface.MessageAddressInvalid" = "Schnittstellenadressen müssen eine Liste von durch Kommas getrennten IP-Adressen sein, optional in CIDR-Notation";
+"errors.wireguard.interface.MessageDNSInvalid" = "Die DNS-Server der Schnittstelle müssen eine Liste von durch Kommas getrennten IP-Adressen sein";
+"errors.wireguard.interface.MessageListenPortInvalid" = "Der Listen-Port der Schnittstelle muss zwischen 0 und 65535 liegen oder nicht angegeben sein";
+"errors.wireguard.interface.MessageMTUInvalid" = "Die MTU der Schnittstelle muss zwischen 576 und 65535 liegen oder nicht angegeben sein";
+"errors.wireguard.interface.MessageNameRequired" = "Schnittstellenname ist erforderlich";
+"errors.wireguard.interface.MessagePrivateKeyInvalid" = "Privater Schlüssel der Schnittstelle muss ein 32-Byte-Schlüssel in Base64-Codierung sein";
+"errors.wireguard.interface.MessagePrivateKeyRequired" = "Privater Schlüssel der Schnittstelle ist erforderlich";
+"errors.wireguard.interface.Title" = "Ungültige Schnittstelle";
+"errors.wireguard.title.AddressInvalid (%@)" = "Adresse '%@' ist ungültig.";
+"errors.wireguard.title.AllowedIPInvalid (%@)" = "Erlaubte IP '%@' ist ungültig";
+"errors.wireguard.title.DNSInvalid (%@)" = "DNS '%@' ist ungültig.";
+"errors.wireguard.title.EndpointInvalid (%@)" = "Endpunkt '%@' ist ungültig";
+"errors.wireguard.title.InfoUnrecognizedInterfaceKey" = "Gültige Schlüssel sind: 'PrivateKey', 'ListenPort', 'Address', 'DNS' und 'MTU'.";
+"errors.wireguard.title.InfoUnrecognizedPeerKey" = "Gültige Schlüssel sind: 'PublicKey', 'PresharedKey', 'AllowedIPs', 'Endpoint' und 'PersistentKeepalive'";
+"errors.wireguard.title.InvalidLine (%@)" = "Ungültige Zeile: '%@'.";
+"errors.wireguard.title.ListenPortInvalid (%@)" = "Listen-Port '%@' ist ungültig.";
+"errors.wireguard.title.MTUInvalid (%@)" = "MTU '%@' ist ungültig.";
+"errors.wireguard.title.MultipleEntriesForKey (%@)" = "Es sollte nur einen Eintrag pro Abschnitt für den Schlüssel '%@' geben";
+"errors.wireguard.title.MultipleInterfaces" = "Die Konfiguration darf nur einen 'Interface'-Abschnitt haben.";
+"errors.wireguard.title.NoInterface" = "Die Konfiguration muss einen 'Interface'-Abschnitt haben.";
+"errors.wireguard.title.PersistentKeepliveInvalid (%@)" = "Wert für persistentes Keepalive '%@' ist ungültig";
+"errors.wireguard.title.PreSharedKeyInvalid" = "Vorgeschalteter Schlüssel ist ungültig";
+"errors.wireguard.title.PrivateKeyInvalid" = "Privater Schlüssel ist ungültig.";
+"errors.wireguard.title.PublicKeyInvalid" = "Öffentlicher Schlüssel ist ungültig";
+"errors.wireguard.title.UnrecognizedInterfaceKey (%@)" = "Schnittstelle enthält nicht erkannten Schlüssel '%@'";
+"errors.wireguard.title.UnrecognizedPeerKey (%@)" = "Peer enthält nicht erkannten Schlüssel '%@'";
+"errors.wireguard.peer.MessageAllowedIPsInvalid" = "Die erlaubten IPs des Peers müssen eine Liste von durch Kommas getrennten IP-Adressen sein, optional in CIDR-Notation";
+"errors.wireguard.peer.MessageEndpointInvalid" = "Das Endpunkt des Peers muss die Form 'host:port' oder '[host]:port' haben";
+"errors.wireguard.peer.MessagePersistentKeepaliveInvalid" = "Der Wert für das persistente Keepalive des Peers muss zwischen 0 und 65535 liegen oder nicht angegeben sein";
+"errors.wireguard.peer.MessagePreSharedKeyInvalid" = "Vorgeschalteter Schlüssel des Peers muss ein 32-Byte-Schlüssel in Base64-Codierung sein";
+"errors.wireguard.peer.MessagePublicKeyDuplicated" = "Zwei oder mehr Peers dürfen nicht denselben öffentlichen Schlüssel haben";
+"errors.wireguard.peer.MessagePublicKeyInvalid" = "Öffentlicher Schlüssel des Peers muss ein 32-Byte-Schlüssel in Base64-Codierung sein";
+"errors.wireguard.peer.MessagePublicKeyRequired" = "Öffentlicher Schlüssel des Peers ist erforderlich";
+"errors.wireguard.peer.Title" = "Ungültiger Peer";
 "features.appletv" = "%@";
 "features.dns" = "DNS-Einstellungen";
 "features.http_proxy" = "HTTP-Proxy-Einstellungen";

Packages/App/Sources/StringsLibrary/Resources/el.lproj/Localizable.strings

@@ -48,6 +48,40 @@
 "errors.tunnel.routing" = "Η δρομολόγηση λείπει";
 "errors.tunnel.shutdown" = "Ο διακομιστής τερματίστηκε";
 "errors.tunnel.tls" = "Το TLS απέτυχε";
+"errors.wireguard.interface.MessageAddressInvalid" = "Οι διευθύνσεις της διεπαφής πρέπει να είναι μια λίστα από IP διευθύνσεις χωρισμένες με κόμμα, προαιρετικά σε σημειογραφία CIDR";
+"errors.wireguard.interface.MessageDNSInvalid" = "Οι διακομιστές DNS της διεπαφής πρέπει να είναι μια λίστα από IP διευθύνσεις χωρισμένες με κόμμα";
+"errors.wireguard.interface.MessageListenPortInvalid" = "Η θύρα ακρόασης της διεπαφής πρέπει να είναι μεταξύ 0 και 65535, ή να μην έχει καθοριστεί";
+"errors.wireguard.interface.MessageMTUInvalid" = "Το MTU της διεπαφής πρέπει να είναι μεταξύ 576 και 65535, ή να μην έχει καθοριστεί";
+"errors.wireguard.interface.MessageNameRequired" = "Απαιτείται όνομα διεπαφής";
+"errors.wireguard.interface.MessagePrivateKeyInvalid" = "Το ιδιωτικό κλειδί της διεπαφής πρέπει να είναι ένα κλειδί 32-byte σε κωδικοποίηση base64";
+"errors.wireguard.interface.MessagePrivateKeyRequired" = "Απαιτείται ιδιωτικό κλειδί διεπαφής";
+"errors.wireguard.interface.Title" = "Μη έγκυρη διεπαφή";
+"errors.wireguard.title.AddressInvalid (%@)" = "Η διεύθυνση '%@' δεν είναι έγκυρη.";
+"errors.wireguard.title.AllowedIPInvalid (%@)" = "Η επιτρεπόμενη IP '%@' δεν είναι έγκυρη";
+"errors.wireguard.title.DNSInvalid (%@)" = "Το DNS '%@' δεν είναι έγκυρο.";
+"errors.wireguard.title.EndpointInvalid (%@)" = "Το endpoint '%@' δεν είναι έγκυρο";
+"errors.wireguard.title.InfoUnrecognizedInterfaceKey" = "Τα έγκυρα κλειδιά είναι: 'PrivateKey', 'ListenPort', 'Address', 'DNS' και 'MTU'.";
+"errors.wireguard.title.InfoUnrecognizedPeerKey" = "Τα έγκυρα κλειδιά είναι: 'PublicKey', 'PresharedKey', 'AllowedIPs', 'Endpoint' και 'PersistentKeepalive'";
+"errors.wireguard.title.InvalidLine (%@)" = "Μη έγκυρη γραμμή: '%@'.";
+"errors.wireguard.title.ListenPortInvalid (%@)" = "Η θύρα ακρόασης '%@' δεν είναι έγκυρη.";
+"errors.wireguard.title.MTUInvalid (%@)" = "Το MTU '%@' δεν είναι έγκυρο.";
+"errors.wireguard.title.MultipleEntriesForKey (%@)" = "Πρέπει να υπάρχει μόνο μία καταχώρηση ανά τμήμα για το κλειδί '%@'";
+"errors.wireguard.title.MultipleInterfaces" = "Η διαμόρφωση πρέπει να έχει μόνο ένα τμήμα 'Interface'.";
+"errors.wireguard.title.NoInterface" = "Η διαμόρφωση πρέπει να έχει ένα τμήμα 'Interface'.";
+"errors.wireguard.title.PersistentKeepliveInvalid (%@)" = "Η τιμή του persistent keepalive '%@' δεν είναι έγκυρη";
+"errors.wireguard.title.PreSharedKeyInvalid" = "Το προ-μοιρασμένο κλειδί δεν είναι έγκυρο";
+"errors.wireguard.title.PrivateKeyInvalid" = "Το ιδιωτικό κλειδί δεν είναι έγκυρο.";
+"errors.wireguard.title.PublicKeyInvalid" = "Το δημόσιο κλειδί δεν είναι έγκυρο";
+"errors.wireguard.title.UnrecognizedInterfaceKey (%@)" = "Η διεπαφή περιέχει μη αναγνωρισμένο κλειδί '%@'";
+"errors.wireguard.title.UnrecognizedPeerKey (%@)" = "Ο peer περιέχει μη αναγνωρισμένο κλειδί '%@'";
+"errors.wireguard.peer.MessageAllowedIPsInvalid" = "Οι επιτρεπόμενες IP του peer πρέπει να είναι μια λίστα από IP διευθύνσεις χωρισμένες με κόμμα, προαιρετικά σε σημειογραφία CIDR";
+"errors.wireguard.peer.MessageEndpointInvalid" = "Το endpoint του peer πρέπει να είναι της μορφής 'host:port' ή '[host]:port'";
+"errors.wireguard.peer.MessagePersistentKeepaliveInvalid" = "Η τιμή του persistent keepalive του peer πρέπει να είναι μεταξύ 0 και 65535, ή να μην έχει καθοριστεί";
+"errors.wireguard.peer.MessagePreSharedKeyInvalid" = "Το προ-μοιρασμένο κλειδί του peer πρέπει να είναι ένα κλειδί 32-byte σε κωδικοποίηση base64";
+"errors.wireguard.peer.MessagePublicKeyDuplicated" = "Δύο ή περισσότεροι peers δεν μπορούν να έχουν το ίδιο δημόσιο κλειδί";
+"errors.wireguard.peer.MessagePublicKeyInvalid" = "Το δημόσιο κλειδί του peer πρέπει να είναι ένα κλειδί 32-byte σε κωδικοποίηση base64";
+"errors.wireguard.peer.MessagePublicKeyRequired" = "Απαιτείται δημόσιο κλειδί του peer";
+"errors.wireguard.peer.Title" = "Μη έγκυρος peer";
 "features.appletv" = "%@";
 "features.dns" = "Ρυθμίσεις DNS";
 "features.http_proxy" = "Ρυθμίσεις HTTP Proxy";

Packages/App/Sources/StringsLibrary/Resources/en.lproj/Localizable.strings

@@ -458,3 +458,44 @@
 "theme.confirmation.cancel" = "Cancel";
 "theme.confirmation.message" = "Are you sure you want to proceed with this operation?";
 "theme.lock_screen.reason" = "%@ is locked";
+
+// MARK: - Errors
+
+// MARK: Errors (WireGuard)
+
+"errors.wireguard.interface.Title" = "Invalid interface";
+"errors.wireguard.interface.MessageNameRequired" = "Interface name is required";
+"errors.wireguard.interface.MessagePrivateKeyRequired" = "Interface’s private key is required";
+"errors.wireguard.interface.MessagePrivateKeyInvalid" = "Interface’s private key must be a 32-byte key in base64 encoding";
+"errors.wireguard.interface.MessageAddressInvalid" = "Interface addresses must be a list of comma-separated IP addresses, optionally in CIDR notation";
+"errors.wireguard.interface.MessageListenPortInvalid" = "Interface’s listen port must be between 0 and 65535, or unspecified";
+"errors.wireguard.interface.MessageMTUInvalid" = "Interface’s MTU must be between 576 and 65535, or unspecified";
+"errors.wireguard.interface.MessageDNSInvalid" = "Interface’s DNS servers must be a list of comma-separated IP addresses";
+
+"errors.wireguard.peer.Title" = "Invalid peer";
+"errors.wireguard.peer.MessagePublicKeyRequired" = "Peer’s public key is required";
+"errors.wireguard.peer.MessagePublicKeyInvalid" = "Peer’s public key must be a 32-byte key in base64 encoding";
+"errors.wireguard.peer.MessagePreSharedKeyInvalid" = "Peer’s preshared key must be a 32-byte key in base64 encoding";
+"errors.wireguard.peer.MessageAllowedIPsInvalid" = "Peer’s allowed IPs must be a list of comma-separated IP addresses, optionally in CIDR notation";
+"errors.wireguard.peer.MessageEndpointInvalid" = "Peer’s endpoint must be of the form ‘host:port’ or ‘[host]:port’";
+"errors.wireguard.peer.MessagePersistentKeepaliveInvalid" = "Peer’s persistent keepalive must be between 0 to 65535, or unspecified";
+"errors.wireguard.peer.MessagePublicKeyDuplicated" = "Two or more peers cannot have the same public key";
+
+"errors.wireguard.title.InvalidLine (%@)" = "Invalid line: ‘%@’.";
+"errors.wireguard.title.NoInterface" = "Configuration must have an ‘Interface’ section.";
+"errors.wireguard.title.MultipleInterfaces" = "Configuration must have only one ‘Interface’ section.";
+"errors.wireguard.title.PrivateKeyInvalid" = "Private key is invalid.";
+"errors.wireguard.title.ListenPortInvalid (%@)" = "Listen port ‘%@’ is invalid.";
+"errors.wireguard.title.AddressInvalid (%@)" = "Address ‘%@’ is invalid.";
+"errors.wireguard.title.DNSInvalid (%@)" = "DNS ‘%@’ is invalid.";
+"errors.wireguard.title.MTUInvalid (%@)" = "MTU ‘%@’ is invalid.";
+"errors.wireguard.title.UnrecognizedInterfaceKey (%@)" = "Interface contains unrecognized key ‘%@’";
+"errors.wireguard.title.InfoUnrecognizedInterfaceKey" = "Valid keys are: ‘PrivateKey’, ‘ListenPort’, ‘Address’, ‘DNS’ and ‘MTU’.";
+"errors.wireguard.title.PublicKeyInvalid" = "Public key is invalid";
+"errors.wireguard.title.PreSharedKeyInvalid" = "Preshared key is invalid";
+"errors.wireguard.title.AllowedIPInvalid (%@)" = "Allowed IP ‘%@’ is invalid";
+"errors.wireguard.title.EndpointInvalid (%@)" = "Endpoint ‘%@’ is invalid";
+"errors.wireguard.title.PersistentKeepliveInvalid (%@)" = "Persistent keepalive value ‘%@’ is invalid";
+"errors.wireguard.title.UnrecognizedPeerKey (%@)" = "Peer contains unrecognized key ‘%@’";
+"errors.wireguard.title.InfoUnrecognizedPeerKey" = "Valid keys are: ‘PublicKey’, ‘PresharedKey’, ‘AllowedIPs’, ‘Endpoint’ and ‘PersistentKeepalive’";
+"errors.wireguard.title.MultipleEntriesForKey (%@)" = "There should be only one entry per section for key ‘%@’";

Packages/App/Sources/StringsLibrary/Resources/es.lproj/Localizable.strings

@@ -48,6 +48,40 @@
 "errors.tunnel.routing" = "Enrutamiento faltante";
 "errors.tunnel.shutdown" = "Apagado del servidor";
 "errors.tunnel.tls" = "TLS fallido";
+"errors.wireguard.interface.MessageAddressInvalid" = "Las direcciones de la interfaz deben ser una lista de direcciones IP separadas por comas, opcionalmente en notación CIDR";
+"errors.wireguard.interface.MessageDNSInvalid" = "Los servidores DNS de la interfaz deben ser una lista de direcciones IP separadas por comas";
+"errors.wireguard.interface.MessageListenPortInvalid" = "El puerto de escucha de la interfaz debe estar entre 0 y 65535, o no especificado";
+"errors.wireguard.interface.MessageMTUInvalid" = "El MTU de la interfaz debe estar entre 576 y 65535, o no especificado";
+"errors.wireguard.interface.MessageNameRequired" = "Se requiere el nombre de la interfaz";
+"errors.wireguard.interface.MessagePrivateKeyInvalid" = "La clave privada de la interfaz debe ser una clave de 32 bytes en codificación base64";
+"errors.wireguard.interface.MessagePrivateKeyRequired" = "Se requiere la clave privada de la interfaz";
+"errors.wireguard.interface.Title" = "Interfaz no válida";
+"errors.wireguard.title.AddressInvalid (%@)" = "La dirección '%@' no es válida.";
+"errors.wireguard.title.AllowedIPInvalid (%@)" = "La IP permitida '%@' no es válida";
+"errors.wireguard.title.DNSInvalid (%@)" = "El DNS '%@' no es válido.";
+"errors.wireguard.title.EndpointInvalid (%@)" = "El punto de conexión '%@' no es válido";
+"errors.wireguard.title.InfoUnrecognizedInterfaceKey" = "Las claves válidas son: 'PrivateKey', 'ListenPort', 'Address', 'DNS' y 'MTU'.";
+"errors.wireguard.title.InfoUnrecognizedPeerKey" = "Las claves válidas son: 'PublicKey', 'PresharedKey', 'AllowedIPs', 'Endpoint' y 'PersistentKeepalive'";
+"errors.wireguard.title.InvalidLine (%@)" = "Línea no válida: '%@'.";
+"errors.wireguard.title.ListenPortInvalid (%@)" = "El puerto de escucha '%@' no es válido.";
+"errors.wireguard.title.MTUInvalid (%@)" = "El MTU '%@' no es válido.";
+"errors.wireguard.title.MultipleEntriesForKey (%@)" = "Debe haber solo una entrada por sección para la clave '%@'";
+"errors.wireguard.title.MultipleInterfaces" = "La configuración debe tener solo una sección 'Interface'.";
+"errors.wireguard.title.NoInterface" = "La configuración debe tener una sección 'Interface'.";
+"errors.wireguard.title.PersistentKeepliveInvalid (%@)" = "El valor de keepalive persistente '%@' no es válido";
+"errors.wireguard.title.PreSharedKeyInvalid" = "La clave precompartida no es válida";
+"errors.wireguard.title.PrivateKeyInvalid" = "La clave privada no es válida.";
+"errors.wireguard.title.PublicKeyInvalid" = "La clave pública no es válida";
+"errors.wireguard.title.UnrecognizedInterfaceKey (%@)" = "La interfaz contiene una clave no reconocida '%@'";
+"errors.wireguard.title.UnrecognizedPeerKey (%@)" = "El peer contiene una clave no reconocida '%@'";
+"errors.wireguard.peer.MessageAllowedIPsInvalid" = "Las IP permitidas del peer deben ser una lista de direcciones IP separadas por comas, opcionalmente en notación CIDR";
+"errors.wireguard.peer.MessageEndpointInvalid" = "El punto de conexión del peer debe tener el formato 'host:port' o '[host]:port'";
+"errors.wireguard.peer.MessagePersistentKeepaliveInvalid" = "El valor de keepalive persistente del peer debe estar entre 0 y 65535, o no especificado";
+"errors.wireguard.peer.MessagePreSharedKeyInvalid" = "La clave precompartida del peer debe ser una clave de 32 bytes en codificación base64";
+"errors.wireguard.peer.MessagePublicKeyDuplicated" = "Dos o más peers no pueden tener la misma clave pública";
+"errors.wireguard.peer.MessagePublicKeyInvalid" = "La clave pública del peer debe ser una clave de 32 bytes en codificación base64";
+"errors.wireguard.peer.MessagePublicKeyRequired" = "Se requiere la clave pública del peer";
+"errors.wireguard.peer.Title" = "Peer no válido";
 "features.appletv" = "%@";
 "features.dns" = "Configuración de DNS";
 "features.http_proxy" = "Configuración del Proxy HTTP";