Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
G
gost
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
gost
Commits
0e782085
Commit
0e782085
authored
Aug 04, 2017
by
rui.zheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support default certificate files
parent
29a1c06b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
cmd/gost/main.go
cmd/gost/main.go
+6
-6
No files found.
cmd/gost/main.go
View file @
0e782085
...
@@ -217,10 +217,7 @@ func serve(chain *gost.Chain) error {
...
@@ -217,10 +217,7 @@ func serve(chain *gost.Chain) error {
if
node
.
User
!=
nil
{
if
node
.
User
!=
nil
{
users
=
append
(
users
,
node
.
User
)
users
=
append
(
users
,
node
.
User
)
}
}
tlsCfg
,
err
:=
tlsConfig
(
node
.
Values
.
Get
(
"cert"
),
node
.
Values
.
Get
(
"key"
))
tlsCfg
,
_
:=
tlsConfig
(
node
.
Values
.
Get
(
"cert"
),
node
.
Values
.
Get
(
"key"
))
if
err
!=
nil
{
return
err
}
var
ln
gost
.
Listener
var
ln
gost
.
Listener
switch
node
.
Transport
{
switch
node
.
Transport
{
...
@@ -359,8 +356,11 @@ func serve(chain *gost.Chain) error {
...
@@ -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.
// 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
)
{
func
tlsConfig
(
certFile
,
keyFile
string
)
(
*
tls
.
Config
,
error
)
{
if
certFile
==
""
||
keyFile
==
""
{
if
certFile
==
""
{
return
nil
,
nil
certFile
=
"cert.pem"
}
if
keyFile
==
""
{
keyFile
=
"key.pem"
}
}
cert
,
err
:=
tls
.
LoadX509KeyPair
(
certFile
,
keyFile
)
cert
,
err
:=
tls
.
LoadX509KeyPair
(
certFile
,
keyFile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment