mirror of https://github.com/fluffle/goirc
Use default root CAs for SSL connections
This commit is contained in:
parent
bfe0705337
commit
41826d3b24
|
@ -5,6 +5,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"net"
|
"net"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"crypto/rand"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
@ -100,16 +101,13 @@ func (conn *Conn) Connect(host string, ssl bool, pass string) os.Error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var sock net.Conn;
|
sock, err := net.Dial("tcp", "", host)
|
||||||
var err os.Error;
|
|
||||||
if ssl {
|
|
||||||
sock, err = tls.Dial("tcp", "", host)
|
|
||||||
} else {
|
|
||||||
sock, err = net.Dial("tcp", "", host)
|
|
||||||
}
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if ssl {
|
||||||
|
sock = tls.Client(sock, &tls.Config{Rand: rand.Reader, Time: time.Nanoseconds})
|
||||||
|
}
|
||||||
|
|
||||||
conn.Host = host
|
conn.Host = host
|
||||||
conn.SSL = ssl
|
conn.SSL = ssl
|
||||||
|
@ -121,7 +119,6 @@ func (conn *Conn) Connect(host string, ssl bool, pass string) os.Error {
|
||||||
go conn.send()
|
go conn.send()
|
||||||
go conn.recv()
|
go conn.recv()
|
||||||
|
|
||||||
// see getStringMsg() in commands.go for what this does
|
|
||||||
if pass != "" {
|
if pass != "" {
|
||||||
conn.Pass(pass)
|
conn.Pass(pass)
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
server: irc.rizon.net
|
server: irc.rizon.net
|
||||||
nick: rbot
|
nick: rbot
|
||||||
user: rbot
|
user: rbot
|
||||||
ssl: false
|
ssl: true
|
||||||
trigger: !
|
trigger: !
|
||||||
|
|
||||||
[#raylu]
|
[#raylu]
|
||||||
|
|
Loading…
Reference in New Issue