From 25850151d7e71175ad60045ca3d7a7c19db1b66f Mon Sep 17 00:00:00 2001 From: Cedric Staub Date: Tue, 21 May 2019 11:20:24 -0700 Subject: [PATCH] Rename dumpAuthTLSFromXXX methods --- starttls/ftp.go | 2 +- starttls/imap.go | 2 +- starttls/starttls.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/starttls/ftp.go b/starttls/ftp.go index 856730d..fb23acf 100644 --- 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 index 3136950..6f57cd9 100644 --- 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 index df5c7b1..0aa1067 100644 --- 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)}