From a947767339a8b576c2ad7dea1cff98a7cde1a394 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 8 Jun 2015 20:54:31 -0700 Subject: [PATCH] Remove unnecessary tlsHelpers, SSL works with domain certificate --- pkg/server/httpserver/httpserver.go | 1 - pkg/server/httpserver/tlshelpers.go | 24 ------------------------ 2 files changed, 25 deletions(-) delete mode 100644 pkg/server/httpserver/tlshelpers.go diff --git a/pkg/server/httpserver/httpserver.go b/pkg/server/httpserver/httpserver.go index ab5250f08..b7ee5e547 100644 --- a/pkg/server/httpserver/httpserver.go +++ b/pkg/server/httpserver/httpserver.go @@ -84,7 +84,6 @@ func start(ctrlChannel <-chan string, errorChannel chan<- error, for _, host := range hosts { fmt.Printf("Starting minio server on: https://%s:%s\n", host, port) } - httpServer.TLSConfig = getDefaultTLSConfig() err = httpServer.ListenAndServeTLS(config.CertFile, config.KeyFile) } errorChannel <- err diff --git a/pkg/server/httpserver/tlshelpers.go b/pkg/server/httpserver/tlshelpers.go deleted file mode 100644 index 8dd41c43f..000000000 --- a/pkg/server/httpserver/tlshelpers.go +++ /dev/null @@ -1,24 +0,0 @@ -package httpserver - -import "crypto/tls" - -func getDefaultTLSConfig() *tls.Config { - config := tls.Config{} - - //Use only modern ciphers - config.CipherSuites = []uint16{ - tls.TLS_RSA_WITH_AES_128_CBC_SHA, - tls.TLS_RSA_WITH_AES_256_CBC_SHA, - tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, - tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, - tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, - tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, - tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, - } - - //Don't allow session resumption - config.SessionTicketsDisabled = true - config.ClientAuth = tls.RequireAnyClientCert - return &config -}