From a114b25c5720cedc93bec36e4fa822fe6cfa85b4 Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 15 Dec 2021 22:53:50 +0100 Subject: [pkg] fix calyx build for osx - binary name is different in the osx bundle, theme won't load - calyx is not ready for tls 1.2 yet --- gui/main.qml | 4 ++-- pkg/helper/args.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/main.qml b/gui/main.qml index f6660df..2d75790 100644 --- a/gui/main.qml +++ b/gui/main.qml @@ -164,9 +164,9 @@ ApplicationWindow { } var providerFlavor = arr[arr.length-1] console.debug("flavor: " + providerFlavor) - if (providerFlavor.startsWith("riseup-vpn")) { + if (providerFlavor.startsWith("riseup-vpn") || providerFlavor == "RiseupVPN") { return "themes/Riseup.qml" - } else if (providerFlavor.startsWith("calyx-vpn")) { + } else if (providerFlavor.startsWith("calyx-vpn") || providerFlavor == "CalyxVPN") { return "themes/Calyx.qml" } else { // we should do a Default theme, with a fallback diff --git a/pkg/helper/args.go b/pkg/helper/args.go index ec4e407..671843c 100644 --- a/pkg/helper/args.go +++ b/pkg/helper/args.go @@ -23,7 +23,7 @@ var ( "--remote-cert-tls", "server", "--dhcp-option", "DNS", nameserverTCP, "--dhcp-option", "DNS", nameserverUDP, - "--tls-version-min", "1.2", + "--tls-version-min", "1.0", "--float", "--log", filepath.Join(LogFolder, "openvpn-leap.log"), } -- cgit v1.2.3