Merge pull request #731 from cryptix/dev
increase minimum version for HTTPS to TLS 1.0 (POODLE, fixes #730)release/v1.15
commit
35140f1cc7
|
@ -5,6 +5,7 @@
|
||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/tls"
|
||||||
"fmt"
|
"fmt"
|
||||||
"html/template"
|
"html/template"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
@ -453,7 +454,9 @@ func runWeb(*cli.Context) {
|
||||||
case setting.HTTP:
|
case setting.HTTP:
|
||||||
err = http.ListenAndServe(listenAddr, m)
|
err = http.ListenAndServe(listenAddr, m)
|
||||||
case setting.HTTPS:
|
case setting.HTTPS:
|
||||||
err = http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
|
cfg := &tls.Config{MinVersion: tls.VersionTLS10}
|
||||||
|
server := &http.Server{Addr: listenAddr, TLSConfig: cfg, Handler: m}
|
||||||
|
err = server.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
|
||||||
case setting.FCGI:
|
case setting.FCGI:
|
||||||
err = fcgi.Serve(nil, m)
|
err = fcgi.Serve(nil, m)
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue