Change auth replies from string to []byte

emersion · Mar 8, 2019 · b06b466 · b06b466
1 parent 76ca910
commit b06b466
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/client/client.go b/client/client.go
@@ -62,7 +62,7 @@ type Client struct {
 	conn  *imap.Conn
 	isTLS bool
 
-	replies   chan string
+	replies   chan []byte
 	loggedOut chan struct{}
 	upgrading bool
 
@@ -167,8 +167,8 @@ func (c *Client) readOnce() (bool, error) {
 	return true, nil
 }
 
-func (c *Client) writeReply(reply string) error {
-	if _, err := c.conn.Writer.Write([]byte(reply)); err != nil {
+func (c *Client) writeReply(reply []byte) error {
+	if _, err := c.conn.Writer.Write(reply); err != nil {
 		return err
 	}
 	// Flush reply
@@ -562,7 +562,7 @@ func New(conn net.Conn) (*Client, error) {
 
 	c := &Client{
 		conn:      imap.NewConn(conn, r, w),
-		replies:   make(chan string),
+		replies:   make(chan []byte),
 		loggedOut: make(chan struct{}),
 		state:     imap.ConnectingState,
 		ErrorLog:  log.New(os.Stderr, "imap/client: ", log.LstdFlags),

diff --git a/client/cmd_noauth.go b/client/cmd_noauth.go
@@ -93,7 +93,7 @@ func (c *Client) Authenticate(auth sasl.Client) error {
 	res := &responses.Authenticate{
 		Mechanism:       auth,
 		InitialResponse: ir,
-		AuthReply: func(reply string) error {
+		AuthReply: func(reply []byte) error {
 			c.replies <- reply
 			return nil
 		},

diff --git a/responses/authenticate.go b/responses/authenticate.go
@@ -7,7 +7,7 @@ import (
 	"github.com/emersion/go-sasl"
 )
 
-type AuthReplyFunc func(reply string) error
+type AuthReplyFunc func(reply []byte) error
 
 // An AUTHENTICATE response.
 type Authenticate struct {
@@ -17,7 +17,7 @@ type Authenticate struct {
 }
 
 func (r *Authenticate) writeLine(l string) error {
-	return r.AuthReply(l + "\r\n")
+	return r.AuthReply([]byte(l + "\r\n"))
 }
 
 func (r *Authenticate) cancel() error {