summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2017-03-27 14:46:28 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2017-04-03 15:41:18 +0200
commitb71f8be2993c887130a00390e46615c882de6655 (patch)
tree8eb5f03a1b697bc7b7cd42a3b0a4a3c5b90157f3
parentd87aab6373338b67e0c24ed33942a615c4809d0d (diff)
[feat] remove the pinning of VPN extra flags
The pinning was removing 'tun-ipv6' wich is a boolean value, there is boolean support in src/leap/bitmask/vpn/launcher.py:232 already. It seems to work fine. - Resolves: #8809
-rw-r--r--src/leap/bitmask/vpn/service.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/leap/bitmask/vpn/service.py b/src/leap/bitmask/vpn/service.py
index f6c7359..17e20af 100644
--- a/src/leap/bitmask/vpn/service.py
+++ b/src/leap/bitmask/vpn/service.py
@@ -142,15 +142,7 @@ class VPNService(HookableService):
config = yield bonafide.do_provider_read(provider, "eip")
remotes = [(gw["ip_address"], gw["capabilities"]["ports"][0])
for gw in config.gateways]
- # FIXME -- bitmask-root cannot parse some options!
- # extra_flags = config.openvpn_configuration
- # XXX picked manually from vpn-service.json
- extra_flags = {
- "auth": "SHA1",
- "cipher": "AES-128-CBC",
- "keepalive": "10 30",
- "tls-cipher": "DHE-RSA-AES128-SHA",
- }
+ extra_flags = config.openvpn_configuration
prefix = os.path.join(self._basepath,
"leap/providers/{0}/keys".format(provider))