Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #519 from philips/fixup-server-tls-client-config

Browse Source 
fix(server): fix client certificate verification
This commit is contained in:
Brandon Philips
2014-02-03 17:33:45 -08:00
parent 0b9c5c975e 6398206e4f
commit 72b393ca53
4 changed files with 230 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/listener.go
View File

@@ -16,11 +16,15 @@ func NewListener(addr string) (net.Listener, error) {
return l, nil
}
func NewTLSListener(addr, certFile, keyFile string) (net.Listener, error) {
func NewTLSListener(config *tls.Config, addr, certFile, keyFile string) (net.Listener, error) {
if addr == "" {
addr = ":https"
}
config := &tls.Config{}
if config == nil {
config = &tls.Config{}
}
config.NextProtos = []string{"http/1.1"}
var err error

6
server/tls_config.go
View File

@@ -6,7 +6,7 @@ import (
// TLSConfig holds the TLS configuration.
type TLSConfig struct {
Scheme string
Server tls.Config
Client tls.Config
Scheme string // http or https
Server tls.Config // Used by the Raft or etcd Server transporter.
Client tls.Config // Used by the Raft peer client.
}