format code

pull/298/head
V2Ray 9 years ago
parent 69bcce0b0d
commit 9371b3d080

@ -1,7 +1,7 @@
package vmess
import (
"bytes"
"bytes"
"crypto/aes"
"crypto/cipher"
"fmt"
@ -13,9 +13,9 @@ const (
)
type DecryptionReader struct {
cipher cipher.Block
reader io.Reader
buffer *bytes.Buffer
cipher cipher.Block
reader io.Reader
buffer *bytes.Buffer
}
func NewDecryptionReader(reader io.Reader, key []byte) (*DecryptionReader, error) {
@ -26,13 +26,13 @@ func NewDecryptionReader(reader io.Reader, key []byte) (*DecryptionReader, error
}
decryptionReader.cipher = cipher
decryptionReader.reader = reader
decryptionReader.buffer = bytes.NewBuffer(make([]byte, 0, 2 * blockSize))
decryptionReader.buffer = bytes.NewBuffer(make([]byte, 0, 2*blockSize))
return decryptionReader, nil
}
func (reader *DecryptionReader) readBlock() error {
buffer := make([]byte, blockSize)
nBytes, err := reader.reader.Read(buffer)
buffer := make([]byte, blockSize)
nBytes, err := reader.reader.Read(buffer)
if err != nil {
return err
}
@ -40,34 +40,34 @@ func (reader *DecryptionReader) readBlock() error {
return fmt.Errorf("Expected to read %d bytes, but got %d bytes", blockSize, nBytes)
}
reader.cipher.Decrypt(buffer, buffer)
reader.buffer.Write(buffer)
reader.buffer.Write(buffer)
return nil
}
func (reader *DecryptionReader) Read(p []byte) (int, error) {
if reader.buffer.Len() == 0 {
err := reader.readBlock()
if err != nil {
return 0, err
}
}
if reader.buffer.Len() == 0 {
err := reader.readBlock()
if err != nil {
return 0, err
}
}
nBytes, err := reader.buffer.Read(p)
if err != nil {
return nBytes, err
}
if nBytes < len(p) {
err = reader.readBlock()
if err != nil {
return nBytes, err
}
moreBytes, err := reader.buffer.Read(p[nBytes:])
if err != nil {
return nBytes, err
}
nBytes += moreBytes
if nBytes != len(p) {
return nBytes, fmt.Errorf("Unable to read %d bytes", len(p))
}
}
return nBytes, err
if err != nil {
return nBytes, err
}
if nBytes < len(p) {
err = reader.readBlock()
if err != nil {
return nBytes, err
}
moreBytes, err := reader.buffer.Read(p[nBytes:])
if err != nil {
return nBytes, err
}
nBytes += moreBytes
if nBytes != len(p) {
return nBytes, fmt.Errorf("Unable to read %d bytes", len(p))
}
}
return nBytes, err
}

@ -1,67 +1,67 @@
package vmess
import (
"bytes"
"crypto/aes"
"crypto/rand"
mrand "math/rand"
"testing"
"bytes"
"crypto/aes"
"crypto/rand"
mrand "math/rand"
"testing"
)
func randomBytes(p []byte, t *testing.T) {
nBytes, err := rand.Read(p)
if err != nil {
t.Fatal(err)
}
if nBytes != len(p) {
t.Error("Unable to generate %d bytes of random buffer", len(p))
}
nBytes, err := rand.Read(p)
if err != nil {
t.Fatal(err)
}
if nBytes != len(p) {
t.Error("Unable to generate %d bytes of random buffer", len(p))
}
}
func TestNormalReading(t *testing.T) {
testSize := 256
plaintext := make([]byte, testSize)
randomBytes(plaintext, t)
testSize := 256
plaintext := make([]byte, testSize)
randomBytes(plaintext, t)
keySize := 16
key := make([]byte, keySize)
randomBytes(key, t)
keySize := 16
key := make([]byte, keySize)
randomBytes(key, t)
cipher, err := aes.NewCipher(key)
if err != nil {
t.Fatal(err)
}
cipher, err := aes.NewCipher(key)
if err != nil {
t.Fatal(err)
}
ciphertext := make([]byte, testSize)
for encryptSize := 0; encryptSize < testSize; encryptSize += blockSize {
cipher.Encrypt(ciphertext[encryptSize:], plaintext[encryptSize:])
}
ciphertext := make([]byte, testSize)
for encryptSize := 0; encryptSize < testSize; encryptSize += blockSize {
cipher.Encrypt(ciphertext[encryptSize:], plaintext[encryptSize:])
}
ciphertextcopy := make([]byte, testSize)
copy(ciphertextcopy, ciphertext)
ciphertextcopy := make([]byte, testSize)
copy(ciphertextcopy, ciphertext)
reader, err := NewDecryptionReader(bytes.NewReader(ciphertextcopy), key)
if err != nil {
t.Fatal(err)
}
reader, err := NewDecryptionReader(bytes.NewReader(ciphertextcopy), key)
if err != nil {
t.Fatal(err)
}
readtext := make([]byte, testSize)
readSize := 0
for readSize < testSize {
nBytes := mrand.Intn(16) + 1
if nBytes > testSize - readSize {
nBytes = testSize - readSize
}
bytesRead, err := reader.Read(readtext[readSize:readSize + nBytes])
if err != nil {
t.Fatal(err)
}
if bytesRead != nBytes {
t.Errorf("Expected to read %d bytes, but only read %d bytes", nBytes, bytesRead)
}
readSize += nBytes
}
if ! bytes.Equal(readtext, plaintext) {
t.Errorf("Expected plaintext %v, but got %v", plaintext, readtext)
}
readtext := make([]byte, testSize)
readSize := 0
for readSize < testSize {
nBytes := mrand.Intn(16) + 1
if nBytes > testSize-readSize {
nBytes = testSize - readSize
}
bytesRead, err := reader.Read(readtext[readSize : readSize+nBytes])
if err != nil {
t.Fatal(err)
}
if bytesRead != nBytes {
t.Errorf("Expected to read %d bytes, but only read %d bytes", nBytes, bytesRead)
}
readSize += nBytes
}
if !bytes.Equal(readtext, plaintext) {
t.Errorf("Expected plaintext %v, but got %v", plaintext, readtext)
}
}
Loading…
Cancel
Save