summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-11-13 07:14:04 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-11-14 16:24:21 +0100
commitc9454e891337461b069bd62b9494e67e9f4e8c22 (patch)
tree9b7a8bdbe017b168c82275110474f2b079c8caa8
parentc7f7b00b0add1354f40c5efc3dd60de02564aff4 (diff)
downloadmullvadvpn-c9454e891337461b069bd62b9494e67e9f4e8c22.tar.xz
mullvadvpn-c9454e891337461b069bd62b9494e67e9f4e8c22.zip
Remove crl.pem from code/readme
-rw-r--r--README.md1
-rwxr-xr-xgui/packages/desktop/electron-builder.yml4
-rw-r--r--talpid-core/src/tunnel/mod.rs3
3 files changed, 2 insertions, 6 deletions
diff --git a/README.md b/README.md
index 75930e12c9..64128743f6 100644
--- a/README.md
+++ b/README.md
@@ -259,7 +259,6 @@ this procedure, the `integration-tests.sh` script can be used to run all integra
pinning
- **ca.crt** - The Mullvad relay server root CA. Bundled with the app and only OpenVPN relays
signed by this CA are trusted
- - **crl.pem** - The certificate revocation list for old relay certificates
### Building, testing and misc
diff --git a/gui/packages/desktop/electron-builder.yml b/gui/packages/desktop/electron-builder.yml
index 38f2dcf6f9..d08895d848 100755
--- a/gui/packages/desktop/electron-builder.yml
+++ b/gui/packages/desktop/electron-builder.yml
@@ -7,11 +7,9 @@ compression: maximum
# assets bundled on all platforms
extraResources:
- # master.mullvad.net certificate used by mullvad-daemon
+ # Mullvad root CA certificate used by OpenVPN
- from: ../../../dist-assets/ca.crt
to: .
- - from: ../../../dist-assets/crl.pem
- to: .
- from: ../../../dist-assets/api_root_ca.pem
to: .
- from: ../../../dist-assets/relays.json
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index 4443898845..39f20588ff 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -258,8 +258,7 @@ impl TunnelMonitor {
.tunnel_options(&options.openvpn)
.enable_ipv6(options.enable_ipv6)
.tunnel_alias(tunnel_alias)
- .ca(resource_dir.join("ca.crt"))
- .crl(resource_dir.join("crl.pem"));
+ .ca(resource_dir.join("ca.crt"));
if let Some(log) = log {
cmd.log(log);
}