From 0e782085ae761d359221ceb6ddc95336c5e3a9ab Mon Sep 17 00:00:00 2001 From: "rui.zheng" Date: Fri, 4 Aug 2017 15:30:32 +0800 Subject: [PATCH] support default certificate files --- cmd/gost/main.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/gost/main.go b/cmd/gost/main.go index 35f5395..9401ca0 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -217,10 +217,7 @@ func serve(chain *gost.Chain) error { if node.User != nil { users = append(users, node.User) } - tlsCfg, err := tlsConfig(node.Values.Get("cert"), node.Values.Get("key")) - if err != nil { - return err - } + tlsCfg, _ := tlsConfig(node.Values.Get("cert"), node.Values.Get("key")) var ln gost.Listener switch node.Transport { @@ -359,8 +356,11 @@ func serve(chain *gost.Chain) error { // Load the certificate from cert and key files, will use the default certificate if the provided info are invalid. func tlsConfig(certFile, keyFile string) (*tls.Config, error) { - if certFile == "" || keyFile == "" { - return nil, nil + if certFile == "" { + certFile = "cert.pem" + } + if keyFile == "" { + keyFile = "key.pem" } cert, err := tls.LoadX509KeyPair(certFile, keyFile) if err != nil {