uwaru/go-xmpp
1
0
Fork 0
forked from jshiffer/go-xmpp
Code Pull Requests Activity

Only try startTls if the connection is not secure

Browse Source
This commit is contained in:
Wichert Akkerman 2019-10-28 14:46:13 +01:00 committed by Mickaël Rémond
parent 6da1962962
commit 2f8ec7b36f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
session.go
View File

@ -29,12 +29,14 @@ func NewSession(transport Transport, o Config, state SMState) (*Session, error)
s.SMState = state s.SMState = state
s.init(o) s.init(o)
s.startTlsIfSupported(o)
if s.err != nil { if s.err != nil {
return nil, NewConnError(s.err, true) return nil, NewConnError(s.err, true)
} }
if !transport.IsSecure() {
s.startTlsIfSupported(o)
}
if !transport.IsSecure() && !o.Insecure { if !transport.IsSecure() && !o.Insecure {
err := fmt.Errorf("failed to negotiate TLS session : %s", s.err) err := fmt.Errorf("failed to negotiate TLS session : %s", s.err)
return nil, NewConnError(err, true) return nil, NewConnError(err, true)