summaryrefslogtreecommitdiff
path: root/app/assets/urls
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-04-22 12:32:57 +0200
committerParménides GV <parmegv@sdf.org>2015-04-22 12:32:57 +0200
commite5e9ac6e43b9cdec0f362711bb33747ab73fc297 (patch)
tree8728c5416b29ca4b66438eb64d06f974f0117e37 /app/assets/urls
parent467abc3431e2ae148ea72e2c3b4c560473424c3f (diff)
parent7d6d55cb62fcdc1e3a36f2634f0399b2d77db263 (diff)
Merge branch 'feature/bitmask-for-android-should-pin-some-prooviders-ca's-cert-fingerprint#6877' into develop
Diffstat (limited to 'app/assets/urls')
-rw-r--r--app/assets/urls/bitmask demo.url3
-rw-r--r--app/assets/urls/calyx.url4
-rw-r--r--app/assets/urls/riseup.url3
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/urls/bitmask demo.url b/app/assets/urls/bitmask demo.url
index 1a412055..81bdba52 100644
--- a/app/assets/urls/bitmask demo.url
+++ b/app/assets/urls/bitmask demo.url
@@ -1,3 +1,4 @@
{
- "main_url" : "https://demo.bitmask.net/"
+ "main_url" : "https://demo.bitmask.net/",
+ "ca_cert_fingerprint" : "c3f9f39af6d42d1f201195dec918ac7603597049"
}
diff --git a/app/assets/urls/calyx.url b/app/assets/urls/calyx.url
index 8de04fe9..9ae902f7 100644
--- a/app/assets/urls/calyx.url
+++ b/app/assets/urls/calyx.url
@@ -1,3 +1,5 @@
{
- "main_url" : "https://calyx.net/"
+ "main_url" : "https://calyx.net/",
+ "ca_cert_fingerprint" : "98086aee17b5800acd0bdefe852e7c1ae72bd248"
+
}
diff --git a/app/assets/urls/riseup.url b/app/assets/urls/riseup.url
index 4548b433..e250e93f 100644
--- a/app/assets/urls/riseup.url
+++ b/app/assets/urls/riseup.url
@@ -1,3 +1,4 @@
{
- "main_url" : "https://riseup.net/"
+ "main_url" : "https://riseup.net/",
+ "ca_cert_fingerprint" : "c429750763322fcc20b6402d7b508ba9e754b176"
}