support more proxy type

utils/crypto/crypto_test.go

@@ -22,15 +22,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestWriter(t *testing.T) {
-	// Empty key.
-	assert := assert.New(t)
-	key := ""
-	buffer := bytes.NewBuffer(nil)
-	_, err := NewWriter(buffer, []byte(key))
-	assert.NoError(err)
-}
-
 func TestCrypto(t *testing.T) {
 	assert := assert.New(t)
 
@@ -40,12 +31,10 @@ func TestCrypto(t *testing.T) {
 	buffer := bytes.NewBuffer(nil)
 	encWriter, err := NewWriter(buffer, []byte(key))
 	assert.NoError(err)
+	decReader := NewReader(buffer, []byte(key))
 
 	encWriter.Write([]byte(text))
 
-	decReader, err := NewReader(buffer, []byte(key))
-	assert.NoError(err)
-
 	c := bytes.NewBuffer(nil)
 	io.Copy(c, decReader)
 	assert.Equal(text, string(c.Bytes()))

utils/crypto/decode.go

@@ -24,13 +24,13 @@ import (
 )
 
 // NewReader returns a new Reader that decrypts bytes from r
-func NewReader(r io.Reader, key []byte) (*Reader, error) {
+func NewReader(r io.Reader, key []byte) *Reader {
 	key = pbkdf2.Key(key, []byte(salt), 64, aes.BlockSize, sha1.New)
 
 	return &Reader{
 		r:   r,
 		key: key,
-	}, nil
+	}
 }
 
 // Reader is an io.Reader that can read encrypted bytes.

utils/crypto/encode.go

@@ -67,10 +67,6 @@ type Writer struct {
 
 // Write satisfies the io.Writer interface.
 func (w *Writer) Write(p []byte) (nRet int, errRet error) {
-	return w.write(p)
-}
-
-func (w *Writer) write(p []byte) (nRet int, errRet error) {
 	if w.err != nil {
 		return 0, w.err
 	}