diff options
| author | micah <micah@riseup.net> | 2019-11-22 05:19:13 -0800 |
|---|---|---|
| committer | micah <micah@riseup.net> | 2019-11-22 05:19:13 -0800 |
| commit | 7211d6a8cf4c0e6c1686cbf1df2d5b867f577f88 (patch) | |
| tree | 0847b4c6c7fe53177036962e31656761e34d9efd | |
| parent | bc4f7b5837c9cd475858742d810023e1d9fc5d64 (diff) | |
| parent | 84ca37f0350f59d6448128d9f7042c15c5ee288b (diff) | |
Merge branch 'master' into 'master'
Upstream api change
See merge request leap/vpnweb!1
| -rwxr-xr-x | scripts/gen-shapeshifter-state.py | 4 | ||||
| -rwxr-xr-x | scripts/simplevpn.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/gen-shapeshifter-state.py b/scripts/gen-shapeshifter-state.py index 1418e23..241c780 100755 --- a/scripts/gen-shapeshifter-state.py +++ b/scripts/gen-shapeshifter-state.py @@ -14,7 +14,7 @@ import pysodium import binascii BRIDGE_PREAMBLE = "Bridge obfs4 <IP ADDRESS>:<PORT> <FINGERPRINT> cert=" -BRIDGE_END = " iat-mode=0" +BRIDGE_END = " iatMode=0" def generate(statedir): @@ -41,7 +41,7 @@ def generate(statedir): 'private-key': tostr(priv_hex), 'public-key': tostr(pub_hex), 'drbg-seed': tostr(binascii.b2a_hex(drbg_seed)), - 'iat-mode': 0})) + 'iatMode': 0})) cert = base64.b64encode(node_id + public) print("CERT:", cert) diff --git a/scripts/simplevpn.py b/scripts/simplevpn.py index 97892ed..02f4cb1 100755 --- a/scripts/simplevpn.py +++ b/scripts/simplevpn.py @@ -51,7 +51,7 @@ def patchObfs4Cert(config, cert): transport, _, _ = options if transport == "obfs4": opts['cert'] = cert - opts['iat-mode'] = "0" + opts['iatMode'] = "0" options.append(opts) return config |