Rename dumpAuthTLSFromXXX methods

square · May 21, 2019 · 2585015 · 2585015
1 parent 75258cf
commit 2585015
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/starttls/ftp.go b/starttls/ftp.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 )
 
-func dumpAuthTLSFromFTP(dialer Dialer, address string, config *tls.Config) (*tls.ConnectionState, error) {
+func dumpTLSConnStateFromFTP(dialer Dialer, address string, config *tls.Config) (*tls.ConnectionState, error) {
 	c, err := dialer.Dial("tcp", address)
 	if err != nil {
 		return nil, err

diff --git a/starttls/imap.go b/starttls/imap.go
@@ -23,7 +23,7 @@ import (
 	"net"
 )
 
-func dumpAuthTLSFromIMAP(dialer Dialer, address string, config *tls.Config) (*tls.ConnectionState, error) {
+func dumpTLSConnStateFromIMAP(dialer Dialer, address string, config *tls.Config) (*tls.ConnectionState, error) {
 	c, err := dialer.Dial("tcp", address)
 	if err != nil {
 		return nil, err

diff --git a/starttls/starttls.go b/starttls/starttls.go
@@ -29,9 +29,9 @@ import (
 
 	"github.com/square/certigo/starttls/ldap"
 	"github.com/square/certigo/starttls/mysql"
-	"github.com/square/certigo/starttls/psql"
+	pq "github.com/square/certigo/starttls/psql"
 
-	"github.com/mwitkow/go-http-dialer"
+	http_dialer "github.com/mwitkow/go-http-dialer"
 )
 
 // Protocols are the names of supported protocols
@@ -232,11 +232,11 @@ func GetConnectionState(startTLSType, connectName, connectTo, identity, clientCe
 			res <- connectResult{&state, nil}
 		case "ftp":
 			addr := withDefaultPort(connectTo, 21)
-			state, err = dumpAuthTLSFromFTP(dialer, addr, tlsConfig)
+			state, err = dumpTLSConnStateFromFTP(dialer, addr, tlsConfig)
 			res <- connectResult{state, err}
 		case "imap":
 			addr := withDefaultPort(connectTo, 143)
-			state, err = dumpAuthTLSFromIMAP(dialer, addr, tlsConfig)
+			state, err = dumpTLSConnStateFromIMAP(dialer, addr, tlsConfig)
 			res <- connectResult{state, err}
 		default:
 			res <- connectResult{nil, fmt.Errorf("unknown StartTLS protocol: %s", startTLSType)}