]> Cypherpunks.ru repositories - goircd.git/commitdiff
SSL name is deprecated, use TLS instead
authorSergey Matveev <stargrave@stargrave.org>
Tue, 10 Jun 2014 07:26:13 +0000 (11:26 +0400)
committerSergey Matveev <stargrave@stargrave.org>
Tue, 10 Jun 2014 07:26:13 +0000 (11:26 +0400)
goircd.go

index 9fdabc0357d1a7430a422aee6c919284b936ce28..366032c7735d1709f52a267d65c6b40823b59bd1 100644 (file)
--- a/goircd.go
+++ b/goircd.go
@@ -35,9 +35,8 @@ var (
        logdir   = flag.String("logdir", "", "Absolute path to directory for logs")
        statedir = flag.String("statedir", "", "Absolute path to directory for states")
 
-       ssl     = flag.Bool("ssl", false, "Use SSL only.")
-       sslKey  = flag.String("ssl_key", "", "SSL keyfile.")
-       sslCert = flag.String("ssl_cert", "", "SSL certificate.")
+       tlsKey  = flag.String("tls_key", "", "TLS keyfile")
+       tlsCert = flag.String("tls_cert", "", "TLS certificate")
 
        verbose = flag.Bool("v", false, "Enable verbose logging.")
 )
@@ -100,10 +99,10 @@ func Run() {
        }
 
        var listener net.Listener
-       if *ssl {
-               cert, err := tls.LoadX509KeyPair(*sslCert, *sslKey)
+       if *tlsKey != "" {
+               cert, err := tls.LoadX509KeyPair(*tlsCert, *tlsKey)
                if err != nil {
-                       log.Fatalf("Could not load SSL keys from %s and %s: %s", *sslCert, *sslKey, err)
+                       log.Fatalf("Could not load TLS keys from %s and %s: %s", *tlsCert, *tlsKey, err)
                }
                config := tls.Config{Certificates: []tls.Certificate{cert}}
                listener, err = tls.Listen("tcp", *bind, &config)