summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-02-05 20:46:33 +0100
committerParménides GV <parmegv@sdf.org>2013-02-05 20:46:33 +0100
commit1d5f1c320ee67cfadd62aeef056a043bee75096d (patch)
treed92f986b1579e6a2b365e774115f39c658d74fca /assets
parent45b86cd7c8922cfd03a7f056941852273c2d122a (diff)
Simplified certificates and urls: only 1 certificate, and no :443 port
in eip. Downloads certificate and eip from web, and loads provider from assets. KeyStore not created with latest version of BouncyCastle. Looking forward to file a bug and look for a solution.
Diffstat (limited to 'assets')
-rw-r--r--assets/providers/bitmask.net_eip-service.json42
-rw-r--r--assets/urls/bitmask.url5
2 files changed, 3 insertions, 44 deletions
diff --git a/assets/providers/bitmask.net_eip-service.json b/assets/providers/bitmask.net_eip-service.json
deleted file mode 100644
index 6ac2fed..0000000
--- a/assets/providers/bitmask.net_eip-service.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "clusters": [
- {
- "label": {
- "en": "Location Unknown"
- },
- "name": "location_unknown"
- }
- ],
- "gateways": [
- {
- "capabilities": {
- "adblock": false,
- "filter_dns": true,
- "ports": [
- "1194",
- "443",
- "53",
- "80"
- ],
- "protocols": [
- "tcp",
- "udp"
- ],
- "transport": [
- "openvpn"
- ],
- "user_ips": false
- },
- "cluster": "location_unknown",
- "host": "aligator.bitmask.net",
- "ip_address": "176.53.69.121"
- }
- ],
- "openvpn_configuration": {
- "auth": "SHA1",
- "cipher": "AES-128-CBC",
- "tls-cipher": "DHE-RSA-AES128-SHA"
- },
- "serial": 1,
- "version": 1
-} \ No newline at end of file
diff --git a/assets/urls/bitmask.url b/assets/urls/bitmask.url
index 132e295..f83ead8 100644
--- a/assets/urls/bitmask.url
+++ b/assets/urls/bitmask.url
@@ -1,6 +1,7 @@
{
"name" : "bitmask",
+ "assets_json_provider" : "providers/bitmask.net_provider.json",
"json_provider" : "https://bitmask.net/provider.json",
- "cert" : "https://bitmask.net/1/cert",
- "json_eip_service" : "https://api.bitmask.net:4430/1/config/eip-service.json"
+ "cert" : "https://bitmask.net/ca.crt",
+ "json_eip_service" : "https://api.bitmask.net/1/config/eip-service.json"
} \ No newline at end of file