fix tests after breaking change how we start obfsvpn in conjunction with openvpn, switching for socks proxying to transparent proxying

11 files changed, 154 insertions, 75 deletions

diff --git a/app/src/test/resources/preconfigured/riseup.net.pem b/app/src/test/resources/preconfigured/riseup.net.pem
index c890aff4..4f801cc1 100644
--- a/app/src/test/resources/preconfigured/riseup.net.pem
+++ b/app/src/test/resources/preconfigured/riseup.net.pem
@@ -1,32 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBZMRgwFgYDVQQKDA9SaXNl
-dXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UE
-AwwXUmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EwHhcNMTQwNDI4MDAwMDAwWhcNMjQw
-NDI4MDAwMDAwWjBZMRgwFgYDVQQKDA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsM
-Emh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UEAwwXUmlzZXVwIE5ldHdvcmtzIFJv
-b3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC76J4ciMJ8Sg0m
-TP7DF2DT9zNe0Csk4myoMFC57rfJeqsAlJCv1XMzBmXrw8wq/9z7XHv6n/0sWU7a
-7cF2hLR33ktjwODlx7vorU39/lXLndo492ZBhXQtG1INMShyv+nlmzO6GT7ESfNE
-LliFitEzwIegpMqxCIHXFuobGSCWF4N0qLHkq/SYUMoOJ96O3hmPSl1kFDRMtWXY
-iw1SEKjUvpyDJpVs3NGxeLCaA7bAWhDY5s5Yb2fA1o8ICAqhowurowJpW7n5ZuLK
-5VNTlNy6nZpkjt1QycYvNycffyPOFm/Q/RKDlvnorJIrihPkyniV3YY5cGgP+Qkx
-HUOT0uLA6LHtzfiyaOqkXwc4b0ZcQD5Vbf6Prd20Ppt6ei0zazkUPwxld3hgyw58
-m/4UIjG3PInWTNf293GngK2Bnz8Qx9e/6TueMSAn/3JBLem56E0WtmbLVjvko+LF
-PM5xA+m0BmuSJtrD1MUCXMhqYTtiOvgLBlUm5zkNxALzG+cXB28k6XikXt6MRG7q
-hzIPG38zwkooM55yy5i1YfcIi5NjMH6A+t4IJxxwb67MSb6UFOwg5kFokdONZcwj
-shczHdG9gLKSBIvrKa03Nd3W2dF9hMbRu//STcQxOailDBQCnXXfAATj9pYzdY4k
-ha8VCAREGAKTDAex9oXf1yRuktES4QIDAQABo2AwXjAdBgNVHQ4EFgQUC4tdmLVu
-f9hwfK4AGliaet5KkcgwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYD
-VR0jBBgwFoAUC4tdmLVuf9hwfK4AGliaet5KkcgwDQYJKoZIhvcNAQENBQADggIB
-AGzL+GRnYu99zFoy0bXJKOGCF5XUXP/3gIXPRDqQf5g7Cu/jYMID9dB3No4Zmf7v
-qHjiSXiS8jx1j/6/Luk6PpFbT7QYm4QLs1f4BlfZOti2KE8r7KRDPIecUsUXW6P/
-3GJAVYH/+7OjA39za9AieM7+H5BELGccGrM5wfl7JeEz8in+V2ZWDzHQO4hMkiTQ
-4ZckuaL201F68YpiItBNnJ9N5nHr1MRiGyApHmLXY/wvlrOpclh95qn+lG6/2jk7
-3AmihLOKYMlPwPakJg4PYczm3icFLgTpjV5sq2md9bRyAg3oPGfAuWHmKj2Ikqch
-Td5CHKGxEEWbGUWEMP0s1A/JHWiCbDigc4Cfxhy56CWG4q0tYtnc2GMw8OAUO6Wf
-Xu5pYKNkzKSEtT/MrNJt44tTZWbKV/Pi/N2Fx36my7TgTUj7g3xcE9eF4JV2H/sg
-tsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF
-tGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ
-UN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp
-0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO
------END CERTIFICATE-----
\ No newline at end of file
+MIIBYjCCAQigAwIBAgIBATAKBggqhkjOPQQDAjAXMRUwEwYDVQQDEwxMRUFQIFJv
+b3QgQ0EwHhcNMjExMTAyMTkwNTM3WhcNMjYxMTAyMTkxMDM3WjAXMRUwEwYDVQQD
+EwxMRUFQIFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQxOXBGu+gf
+pjHzVteGTWL6XnFxtEnKMFpKaJkA/VOHmESzoLsZRQxt88GssxaqC01J17idQiqv
+zgNpedmtvFtyo0UwQzAOBgNVHQ8BAf8EBAMCAqQwEgYDVR0TAQH/BAgwBgEB/wIB
+ATAdBgNVHQ4EFgQUZdoUlJrCIUNFrpffAq+LQjnwEz4wCgYIKoZIzj0EAwIDSAAw
+RQIgfr3w4tnRG+NdI3LsGPlsRktGK20xHTzsB3orB0yC6cICIQCB+/9y8nmSStfN
+VUMUyk2hNd7/kC8nL222TTD7VZUtsg==
+-----END CERTIFICATE-----
diff --git a/app/src/test/resources/ptdemo.bitmask.eip-service-obfsvpn1.0.0.json b/app/src/test/resources/ptdemo.bitmask.eip-service-obfsvpn1.0.0.json
new file mode 100644
index 00000000..2b3d7fd7
--- /dev/null
+++ b/app/src/test/resources/ptdemo.bitmask.eip-service-obfsvpn1.0.0.json
@@ -0,0 +1,64 @@
+{
+  "gateways":[
+    {
+      "capabilities":{
+        "adblock":false,
+        "filter_dns":false,
+        "limited":false,
+        "transport":[
+          {
+            "type":"obfs4",
+            "protocols":[
+              "tcp"
+            ],
+            "ports":[
+              "23049"
+            ],
+            "options": {
+              "cert": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX1",
+              "iatMode": "0"
+            }
+          },
+          {
+            "type":"openvpn",
+            "protocols":[
+              "udp"
+            ],
+            "ports":[
+              "1195"
+            ]
+          }
+        ],
+        "user_ips":false
+      },
+      "host":"pt.demo.bitmask.net",
+      "ip_address":"37.218.247.60",
+      "location":"Amsterdam"
+    }
+  ],
+  "locations":{
+    "Amsterdam":{
+      "country_code":"NL",
+      "hemisphere":"N",
+      "name":"Amsterdam",
+      "timezone":"-1"
+    }
+  },
+  "openvpn_configuration":{
+    "auth":"SHA1",
+    "cipher":"AES-256-CBC",
+    "keepalive":"10 30",
+    "tls-cipher":"DHE-RSA-AES128-SHA",
+    "tun-ipv6":true,
+    "dev" : "tun",
+    "sndbuf" : "0",
+    "rcvbuf" : "0",
+    "nobind" : true,
+    "persist-key" : true,
+    "comp-lzo" : true,
+    "key-direction" : "1",
+    "verb" : "3"
+  },
+  "serial":2,
+  "version":3
+}
\ No newline at end of file
diff --git a/app/src/test/resources/ptdemo_kcp_gateways.json b/app/src/test/resources/ptdemo_kcp_gateways.json
index 8c2c9d32..afd7db69 100644
--- a/app/src/test/resources/ptdemo_kcp_gateways.json
+++ b/app/src/test/resources/ptdemo_kcp_gateways.json
@@ -22,7 +22,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "1195"
@@ -57,7 +58,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "1195"
diff --git a/app/src/test/resources/ptdemo_misconfigured_ipv4ipv6.json b/app/src/test/resources/ptdemo_misconfigured_ipv4ipv6.json
index 5c913c14..9412e099 100644
--- a/app/src/test/resources/ptdemo_misconfigured_ipv4ipv6.json
+++ b/app/src/test/resources/ptdemo_misconfigured_ipv4ipv6.json
@@ -22,7 +22,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "1195"
diff --git a/app/src/test/resources/ptdemo_misconfigured_udp2.json b/app/src/test/resources/ptdemo_misconfigured_tcp2.json
index d2a54cef..5c913c14 100644
--- a/app/src/test/resources/ptdemo_misconfigured_udp2.json
+++ b/app/src/test/resources/ptdemo_misconfigured_tcp2.json
@@ -22,7 +22,7 @@
           {
             "type":"openvpn",
             "protocols":[
-              "udp"
+              "tcp"
             ],
             "ports":[
               "1195"
diff --git a/app/src/test/resources/ptdemo_misconfigured_udptcp.json b/app/src/test/resources/ptdemo_misconfigured_udptcp.json
index 42d55de9..016d45da 100644
--- a/app/src/test/resources/ptdemo_misconfigured_udptcp.json
+++ b/app/src/test/resources/ptdemo_misconfigured_udptcp.json
@@ -23,7 +23,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "1195"
diff --git a/app/src/test/resources/ptdemo_obfs4hop_tcp_gateways.json b/app/src/test/resources/ptdemo_obfs4hop_tcp_gateways.json
index 34bcecb3..1d234ce2 100644
--- a/app/src/test/resources/ptdemo_obfs4hop_tcp_gateways.json
+++ b/app/src/test/resources/ptdemo_obfs4hop_tcp_gateways.json
@@ -22,7 +22,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "1195"
diff --git a/app/src/test/resources/ptdemo_three_mixed_gateways.json b/app/src/test/resources/ptdemo_three_mixed_gateways.json
index 9b04cab4..e48e6cca 100644
--- a/app/src/test/resources/ptdemo_three_mixed_gateways.json
+++ b/app/src/test/resources/ptdemo_three_mixed_gateways.json
@@ -22,7 +22,7 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "udp"
             ],
             "ports":[
               "1195"
@@ -57,7 +57,7 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "udp"
             ],
             "ports":[
               "1195"
diff --git a/app/src/test/resources/riseup.net.pem b/app/src/test/resources/riseup.net.pem
index c890aff4..4f801cc1 100644
--- a/app/src/test/resources/riseup.net.pem
+++ b/app/src/test/resources/riseup.net.pem
@@ -1,32 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBZMRgwFgYDVQQKDA9SaXNl
-dXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UE
-AwwXUmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EwHhcNMTQwNDI4MDAwMDAwWhcNMjQw
-NDI4MDAwMDAwWjBZMRgwFgYDVQQKDA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsM
-Emh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UEAwwXUmlzZXVwIE5ldHdvcmtzIFJv
-b3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC76J4ciMJ8Sg0m
-TP7DF2DT9zNe0Csk4myoMFC57rfJeqsAlJCv1XMzBmXrw8wq/9z7XHv6n/0sWU7a
-7cF2hLR33ktjwODlx7vorU39/lXLndo492ZBhXQtG1INMShyv+nlmzO6GT7ESfNE
-LliFitEzwIegpMqxCIHXFuobGSCWF4N0qLHkq/SYUMoOJ96O3hmPSl1kFDRMtWXY
-iw1SEKjUvpyDJpVs3NGxeLCaA7bAWhDY5s5Yb2fA1o8ICAqhowurowJpW7n5ZuLK
-5VNTlNy6nZpkjt1QycYvNycffyPOFm/Q/RKDlvnorJIrihPkyniV3YY5cGgP+Qkx
-HUOT0uLA6LHtzfiyaOqkXwc4b0ZcQD5Vbf6Prd20Ppt6ei0zazkUPwxld3hgyw58
-m/4UIjG3PInWTNf293GngK2Bnz8Qx9e/6TueMSAn/3JBLem56E0WtmbLVjvko+LF
-PM5xA+m0BmuSJtrD1MUCXMhqYTtiOvgLBlUm5zkNxALzG+cXB28k6XikXt6MRG7q
-hzIPG38zwkooM55yy5i1YfcIi5NjMH6A+t4IJxxwb67MSb6UFOwg5kFokdONZcwj
-shczHdG9gLKSBIvrKa03Nd3W2dF9hMbRu//STcQxOailDBQCnXXfAATj9pYzdY4k
-ha8VCAREGAKTDAex9oXf1yRuktES4QIDAQABo2AwXjAdBgNVHQ4EFgQUC4tdmLVu
-f9hwfK4AGliaet5KkcgwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYD
-VR0jBBgwFoAUC4tdmLVuf9hwfK4AGliaet5KkcgwDQYJKoZIhvcNAQENBQADggIB
-AGzL+GRnYu99zFoy0bXJKOGCF5XUXP/3gIXPRDqQf5g7Cu/jYMID9dB3No4Zmf7v
-qHjiSXiS8jx1j/6/Luk6PpFbT7QYm4QLs1f4BlfZOti2KE8r7KRDPIecUsUXW6P/
-3GJAVYH/+7OjA39za9AieM7+H5BELGccGrM5wfl7JeEz8in+V2ZWDzHQO4hMkiTQ
-4ZckuaL201F68YpiItBNnJ9N5nHr1MRiGyApHmLXY/wvlrOpclh95qn+lG6/2jk7
-3AmihLOKYMlPwPakJg4PYczm3icFLgTpjV5sq2md9bRyAg3oPGfAuWHmKj2Ikqch
-Td5CHKGxEEWbGUWEMP0s1A/JHWiCbDigc4Cfxhy56CWG4q0tYtnc2GMw8OAUO6Wf
-Xu5pYKNkzKSEtT/MrNJt44tTZWbKV/Pi/N2Fx36my7TgTUj7g3xcE9eF4JV2H/sg
-tsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF
-tGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ
-UN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp
-0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO
------END CERTIFICATE-----
\ No newline at end of file
+MIIBYjCCAQigAwIBAgIBATAKBggqhkjOPQQDAjAXMRUwEwYDVQQDEwxMRUFQIFJv
+b3QgQ0EwHhcNMjExMTAyMTkwNTM3WhcNMjYxMTAyMTkxMDM3WjAXMRUwEwYDVQQD
+EwxMRUFQIFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQxOXBGu+gf
+pjHzVteGTWL6XnFxtEnKMFpKaJkA/VOHmESzoLsZRQxt88GssxaqC01J17idQiqv
+zgNpedmtvFtyo0UwQzAOBgNVHQ8BAf8EBAMCAqQwEgYDVR0TAQH/BAgwBgEB/wIB
+ATAdBgNVHQ4EFgQUZdoUlJrCIUNFrpffAq+LQjnwEz4wCgYIKoZIzj0EAwIDSAAw
+RQIgfr3w4tnRG+NdI3LsGPlsRktGK20xHTzsB3orB0yC6cICIQCB+/9y8nmSStfN
+VUMUyk2hNd7/kC8nL222TTD7VZUtsg==
+-----END CERTIFICATE-----
diff --git a/app/src/test/resources/v4/generictest.cert b/app/src/test/resources/v4/generictest.cert
new file mode 100644
index 00000000..a06b2921
--- /dev/null
+++ b/app/src/test/resources/v4/generictest.cert
@@ -0,0 +1,49 @@
+-----BEGIN CERTIFICATE-----
+MIIDbzCCAlegAwIBAgIRAJ13v8he4G1gJrAmxoaq9V4wDQYJKoZIhvcNAQELBQAw
+FjEUMBIGA1UEAwwLRWFzeS1SU0EgQ0EwHhcNMjQwNjI0MjIyMzAxWhcNMjYwOTI3
+MjIyMzAxWjArMSkwJwYDVQQDDCB5UnhiNmQwdnRiZW1UYW51NHJ2MkVIMHEzSEhZ
+ZzBxNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMdIIe89GksectVQ
+i52g660W4Fvs7fQ6DecXxiEbTu4kfxo3WmxmsdI6h4BFf+3SOiUHVWYNf1IjKR+V
+mG5oCybSjz0GFzcBj+SjkhM4lggkQKhRPzjqWDL2GTTrGoKHWdcV6tCcphCB3Zgz
+o5ObuW0SEYACHJ535H9QrDvB75mMervd0ZHdmDCtJgxze6rwrNMGrU28CIOUFIM7
+uhobdcNvFFlZ/kTzPC0/UTNWS7TwT8IhAlSYN7A7hX5cb1H/PK7TrBzux37VvRt4
+TUPiMpiUi0Ha6pNxnNtNX0jbQhPJMFA69ZD3R+ViiET63/J2ZdC5w+t3JkYxJj+K
+9PcjRX8CAwEAAaOBojCBnzAJBgNVHRMEAjAAMB0GA1UdDgQWBBRD9M3aA0xwS49h
+tPZ5cBIIZUVNqDBRBgNVHSMESjBIgBQfgnyX5vtKuv9mzvmKnXmTH8Cc2KEapBgw
+FjEUMBIGA1UEAwwLRWFzeS1SU0EgQ0GCFFgV0SauPQ7erBxVTSSB8oskg1EPMBMG
+A1UdJQQMMAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOC
+AQEAPmlNsl5Z5qeRzUDhzddw5c4fOacTgmHbS0jces6suoE81A8al6lbpY0g3vZa
+nDK7V/U/+M3XLzyQg4WQTR/bRSX1flDEy7KABUjt9N2m3fAirRnErJhEWPT+s4N6
+HpfRWQJ+z6H0Pp0uh6U+13KjuYVG1q/+MJ+7cF5UvLW1WZQ2eDOjf1Glt7tUW2ZZ
+TOfKfeyRHZlnU2ChfqOK2IoN7u3Ofe3ve6ZYSTKXVdaDUMJ9AxOU5m7SqBPEexBM
+tCXkJuFyPufFDwgmRzI/ohVHF8ZJUIat5jYnrHEJPaneoFdT+2QtkfLLzaGHiRnE
+Od22VQH8UFSKu7odZF8sHBGSVA==
+-----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDHSCHvPRpLHnLV
+UIudoOutFuBb7O30Og3nF8YhG07uJH8aN1psZrHSOoeARX/t0jolB1VmDX9SIykf
+lZhuaAsm0o89Bhc3AY/ko5ITOJYIJECoUT846lgy9hk06xqCh1nXFerQnKYQgd2Y
+M6OTm7ltEhGAAhyed+R/UKw7we+ZjHq73dGR3ZgwrSYMc3uq8KzTBq1NvAiDlBSD
+O7oaG3XDbxRZWf5E8zwtP1EzVku08E/CIQJUmDewO4V+XG9R/zyu06wc7sd+1b0b
+eE1D4jKYlItB2uqTcZzbTV9I20ITyTBQOvWQ90flYohE+t/ydmXQucPrdyZGMSY/
+ivT3I0V/AgMBAAECggEADxlOhOdexiFE9xeWtHc8VA1/K0fc0ZvScNdyyhBdHxsB
+zFU0UzFGuNR5bsUVR8odYK/ZDxXntyv10jBN79OPQL5EXw3GlYLXSa4BA9bOO0iv
+43Dgdun+i8Hsr/8+L3Sc4HiHJY4w4OBOD1meQ7FRT8vGKqo+S91uoRzWJ+LuSfZh
+8d7vMCvd1qX2p2wLW/GEB8UPim/6elnoXtr0iqjfZzZHKuMoWp0HYuyjdN6OC/UK
+38GyFtix2soIUDSP5hHk2vLVUq0RbEuNwz4Gf7W7YLMWAjUBK8qh3WM2HaPFwqv6
+yppN7jCzOc0Wi41C8sEbo7Ct0WqLrkG2qQ2Eo8/y1QKBgQD5vsoI0jl6wfjvlrjL
+3fR7u9joFGbXRBtu5QPwqozIXnxU5VBZvZ5Q/mgG9XfSWrUizOTHZP7qViPsHTqB
+f3paY53946wVrx2H2aDl8HagblDfJMxKVDBvSqoXfyVTQYYzk+EzyAQnddzArcQ4
+Egpl5Sa3qruEgs4/nZDsWcw17QKBgQDMRc2JVGBlYLDlx/NOYwTNjCdwVmjDG57C
+z5DUNHqX1vRTlxQsY8pCcYbrtr2pwz7e3IK9mg2gluhyNejTXhC7lWN/5n5QTQBO
+RbF40SCAVJFUjofW++g8fUZTREpKJ7qMAT/6NoZSmWvUSr2TvkoBEJnNHjKXfPDd
+KJRbFjU7mwKBgQCb8om/xl3EDLmAChKsopUWam8ARDUPeGTU80ZpkmXEfFOQw3xP
+/TqNgr68kazXenKfH2hAJg2TkGRv/LRaxppFNO0j63W6OJXtDXUOAABjH196Z0T1
+qOpxpCLf9zH8ce716AJ4zg3iAhPtcNQU2xcJF3T8vSzIitF1IdOr8kq05QKBgQCN
+keL8xkl4eSagWY86SE3P1s6OgJRihAXnpcsOBsDf8s2qEQ6eJRrMKboEKsYPnY05
+D0Jc/SNspKm8XbhapNqb5tDql2f7ZyJLHOn+fZE032dJXu6uBC/TnE7c7ns+IYKb
+/VHFq3w0Srf8jUAN4NeRHVw6WC9f5etYmwMWjbGe+QKBgQCJKVPdIy3dkjwdul3Y
+BEBDYkxDj34dGDWlfwddtMgCaVBbSlvwkb4h/HgaD7gBf/GhgYR1UAXafoRCQCE0
+tq/bQhRZ+Xin7qhVHi4FS4ig91TQHUwFaYQVrpEbWZSCgE6NGAbsbkp4uKOY1WDd
+igAuQb29cbkbSO5F7lsQjRrmAw==
+-----END PRIVATE KEY-----
diff --git a/app/src/test/resources/v4/riseup_eipservice_for_geoip_v4.json b/app/src/test/resources/v4/riseup_eipservice_for_geoip_v4.json
index 76fbea52..f3ce4b5f 100644
--- a/app/src/test/resources/v4/riseup_eipservice_for_geoip_v4.json
+++ b/app/src/test/resources/v4/riseup_eipservice_for_geoip_v4.json
@@ -9,7 +9,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "443"
@@ -44,7 +45,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "443"
@@ -66,7 +68,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "443"
@@ -88,7 +91,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "443"
@@ -123,7 +127,8 @@
           {
             "type":"openvpn",
             "protocols":[
-              "tcp"
+              "tcp",
+              "udp"
             ],
             "ports":[
               "443"