admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: custom cipher for custom files on Openvpn 2.5

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-06-07 19:45:19 +00:00
parent f9308e6fed
commit 3d2c56d9ee
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/openvpn/custom.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/qdm12/gluetun/internal/configuration" "github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider/utils"
"github.com/qdm12/golibs/os" "github.com/qdm12/golibs/os"
) )
@@ -64,6 +65,7 @@ func modifyCustomConfig(lines []string, username string,
strings.HasPrefix(line, "verb "), strings.HasPrefix(line, "verb "),
strings.HasPrefix(line, "auth-user-pass "), strings.HasPrefix(line, "auth-user-pass "),
len(settings.Cipher) > 0 && strings.HasPrefix(line, "cipher "), len(settings.Cipher) > 0 && strings.HasPrefix(line, "cipher "),
len(settings.Cipher) > 0 && strings.HasPrefix(line, "data-ciphers"),
len(settings.Auth) > 0 && strings.HasPrefix(line, "auth "), len(settings.Auth) > 0 && strings.HasPrefix(line, "auth "),
settings.MSSFix > 0 && strings.HasPrefix(line, "mssfix "), settings.MSSFix > 0 && strings.HasPrefix(line, "mssfix "),
!settings.Provider.ExtraConfigOptions.OpenVPNIPv6 && strings.HasPrefix(line, "tun-ipv6"): !settings.Provider.ExtraConfigOptions.OpenVPNIPv6 && strings.HasPrefix(line, "tun-ipv6"):
@@ -81,7 +83,7 @@ func modifyCustomConfig(lines []string, username string,
modified = append(modified, "auth-user-pass "+constants.OpenVPNAuthConf) modified = append(modified, "auth-user-pass "+constants.OpenVPNAuthConf)
modified = append(modified, "verb "+strconv.Itoa(settings.Verbosity)) modified = append(modified, "verb "+strconv.Itoa(settings.Verbosity))
if len(settings.Cipher) > 0 { if len(settings.Cipher) > 0 {
modified = append(modified, "cipher "+settings.Cipher) modified = append(modified, utils.CipherLines(settings.Cipher, settings.Version)...)
} }
if len(settings.Auth) > 0 { if len(settings.Auth) > 0 {
modified = append(modified, "auth "+settings.Auth) modified = append(modified, "auth "+settings.Auth)