Version 1.0 alpha

io/aes.go

@@ -12,8 +12,8 @@ func NewAesDecryptReader(key []byte, iv []byte, reader io.Reader) (io.Reader, er
 		return nil, err
 	}
 
-	aesMode := cipher.NewCBCDecrypter(aesBlock, iv)
-	return NewCryptionReader(aesMode, reader), nil
+	aesStream := cipher.NewCFBDecrypter(aesBlock, iv)
+	return NewCryptionReader(aesStream, reader), nil
 }
 
 func NewAesEncryptWriter(key []byte, iv []byte, writer io.Writer) (io.Writer, error) {
@@ -22,6 +22,6 @@ func NewAesEncryptWriter(key []byte, iv []byte, writer io.Writer) (io.Writer, er
 		return nil, err
 	}
 
-	aesMode := cipher.NewCBCEncrypter(aesBlock, iv)
-	return NewCryptionWriter(aesMode, writer), nil
+	aesStream := cipher.NewCFBEncrypter(aesBlock, iv)
+	return NewCryptionWriter(aesStream, writer), nil
 }

io/encryption.go

@@ -3,18 +3,20 @@ package io
 import (
 	"crypto/cipher"
 	"io"
+
+	"github.com/v2ray/v2ray-core/log"
 )
 
 // CryptionReader is a general purpose reader that applies
 // block cipher on top of a regular reader.
 type CryptionReader struct {
-	mode   cipher.BlockMode
+	stream cipher.Stream
 	reader io.Reader
 }
 
-func NewCryptionReader(mode cipher.BlockMode, reader io.Reader) *CryptionReader {
+func NewCryptionReader(stream cipher.Stream, reader io.Reader) *CryptionReader {
 	this := new(CryptionReader)
-	this.mode = mode
+	this.stream = stream
 	this.reader = reader
 	return this
 }
@@ -23,32 +25,26 @@ func NewCryptionReader(mode cipher.BlockMode, reader io.Reader) *CryptionReader
 // a multiply of BlockSize()
 func (reader CryptionReader) Read(blocks []byte) (int, error) {
 	nBytes, err := reader.reader.Read(blocks)
-	if err != nil && err != io.EOF {
-		return nBytes, err
+	log.Debug("CryptionReader: Read %d bytes", nBytes)
+	if nBytes > 0 {
+		reader.stream.XORKeyStream(blocks[:nBytes], blocks[:nBytes])
 	}
-	if nBytes < len(blocks) {
-		for i, _ := range blocks[nBytes:] {
-			blocks[i] = 0
-		}
+	if err != nil {
+		log.Error("Error reading blocks: %v", err)
 	}
-	reader.mode.CryptBlocks(blocks, blocks)
 	return nBytes, err
 }
 
-func (reader CryptionReader) BlockSize() int {
-	return reader.mode.BlockSize()
-}
-
 // Cryption writer is a general purpose of byte stream writer that applies
 // block cipher on top of a regular writer.
 type CryptionWriter struct {
-	mode   cipher.BlockMode
+	stream cipher.Stream
 	writer io.Writer
 }
 
-func NewCryptionWriter(mode cipher.BlockMode, writer io.Writer) *CryptionWriter {
+func NewCryptionWriter(stream cipher.Stream, writer io.Writer) *CryptionWriter {
 	this := new(CryptionWriter)
-	this.mode = mode
+	this.stream = stream
 	this.writer = writer
 	return this
 }
@@ -56,10 +52,7 @@ func NewCryptionWriter(mode cipher.BlockMode, writer io.Writer) *CryptionWriter
 // Write writes the give blocks to underlying writer. The length of the blocks
 // must be a multiply of BlockSize()
 func (writer CryptionWriter) Write(blocks []byte) (int, error) {
-	writer.mode.CryptBlocks(blocks, blocks)
+	log.Debug("CryptionWriter writing %d bytes", len(blocks))
+	writer.stream.XORKeyStream(blocks, blocks)
 	return writer.writer.Write(blocks)
 }
-
-func (writer CryptionWriter) BlockSize() int {
-	return writer.mode.BlockSize()
-}

io/vmess/decryptionreader.go

@@ -29,8 +29,8 @@ func NewDecryptionReader(reader io.Reader, key []byte, iv []byte) (*DecryptionRe
 	if err != nil {
 		return nil, err
 	}
-	aesBlockMode := cipher.NewCBCDecrypter(aesCipher, iv)
-	decryptionReader.reader = v2io.NewCryptionReader(aesBlockMode, reader)
+	aesStream := cipher.NewCFBDecrypter(aesCipher, iv)
+	decryptionReader.reader = v2io.NewCryptionReader(aesStream, reader)
 	decryptionReader.buffer = bytes.NewBuffer(make([]byte, 0, 2*blockSize))
 	return decryptionReader, nil
 }

io/vmess/decryptionreader_test.go

@@ -35,10 +35,10 @@ func TestNormalReading(t *testing.T) {
 	aesBlock, err := aes.NewCipher(key)
 	assert.Error(err).IsNil()
 
-	aesMode := cipher.NewCBCEncrypter(aesBlock, iv)
+	aesStream := cipher.NewCFBEncrypter(aesBlock, iv)
 
 	ciphertext := make([]byte, testSize)
-	aesMode.CryptBlocks(ciphertext, plaintext)
+	aesStream.XORKeyStream(ciphertext, plaintext)
 
 	ciphertextcopy := make([]byte, testSize)
 	copy(ciphertextcopy, ciphertext)

io/vmess/vmess.go

@@ -224,8 +224,8 @@ func (w *VMessRequestWriter) Write(writer io.Writer, request *VMessRequest) erro
 	if err != nil {
 		return err
 	}
-	aesMode := cipher.NewCBCEncrypter(aesCipher, make([]byte, blockSize))
-	cWriter := v2io.NewCryptionWriter(aesMode, writer)
+	aesStream := cipher.NewCFBEncrypter(aesCipher, make([]byte, blockSize))
+	cWriter := v2io.NewCryptionWriter(aesStream, writer)
 
 	_, err = writer.Write(buffer[0:encryptionBegin])
 	if err != nil {