diff --git a/Makefile b/Makefile index 54a1bfa..ddd09fe 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ NAME=gost BINDIR=bin VERSION=$(shell cat cmd/gost/version.go | grep 'version =' | sed 's/.*\"\(.*\)\".*/\1/g') GOBUILD=CGO_ENABLED=0 go build --ldflags="-s -w" -v -x -a -GOFILES=cmd/gost/* +GOFILES=cmd/gost/*.go PLATFORM_LIST = \ darwin-amd64 \ diff --git a/cmd/gost/cmd.go b/cmd/gost/cmd.go index 2592b69..27b603c 100644 --- a/cmd/gost/cmd.go +++ b/cmd/gost/cmd.go @@ -389,6 +389,8 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) { md.Del("auth") tlsConfig := &config.TLSConfig{ + CertFile: metadata.GetString(md, "certFile"), + KeyFile: metadata.GetString(md, "keyFile"), CAFile: metadata.GetString(md, "caFile"), Secure: metadata.GetBool(md, "secure"), ServerName: metadata.GetString(md, "serverName"), @@ -396,11 +398,13 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) { if tlsConfig.ServerName == "" { tlsConfig.ServerName = url.Hostname() } + md.Del("certFile") + md.Del("keyFile") md.Del("caFile") md.Del("secure") md.Del("serverName") - if !tlsConfig.Secure && tlsConfig.CAFile == "" { + if !tlsConfig.Secure && tlsConfig.CertFile == "" && tlsConfig.CAFile == "" { tlsConfig = nil } diff --git a/cmd/gost/version.go b/cmd/gost/version.go index 120c0e5..c76eb76 100644 --- a/cmd/gost/version.go +++ b/cmd/gost/version.go @@ -1,5 +1,5 @@ package main const ( - version = "3.0.0-alpha.1" + version = "3.0.0-alpha.2" )