一些改进，但不要立即合并

aes256cbc/aes256cbc.go

@@ -0,0 +1,169 @@
+// Package aes256cbc is a helper to generate OpenSSL compatible encryption
+// with autmatic IV derivation and storage. As long as the key is known all
+// data can also get decrypted using OpenSSL CLI.
+// Code from http://dequeue.blogspot.de/2014/11/decrypting-something-encrypted-with.html
+package aes256cbc
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/md5"
+	"crypto/rand"
+	"encoding/base64"
+	"fmt"
+	"io"
+)
+
+// OpenSSL salt is always this string + 8 bytes of actual salt
+var openSSLSaltHeader = []byte("Salted__")
+
+type openSSLCreds [48]byte
+
+// openSSLEvpBytesToKey follows the OpenSSL (undocumented?) convention for extracting the key and IV from passphrase.
+// It uses the EVP_BytesToKey() method which is basically:
+// D_i = HASH^count(D_(i-1) || password || salt) where || denotes concatentaion, until there are sufficient bytes available
+// 48 bytes since we're expecting to handle AES-256, 32bytes for a key and 16bytes for the IV
+func (c *openSSLCreds) Extract(password, salt []byte) (key, iv []byte) {
+	m := c[:]
+	buf := make([]byte, 0, 16+len(password)+len(salt))
+	var prevSum [16]byte
+	for i := 0; i < 3; i++ {
+		n := 0
+		if i > 0 {
+			n = 16
+		}
+		buf = buf[:n+len(password)+len(salt)]
+		copy(buf, prevSum[:])
+		copy(buf[n:], password)
+		copy(buf[n+len(password):], salt)
+		prevSum = md5.Sum(buf)
+		copy(m[i*16:], prevSum[:])
+	}
+	return c[:32], c[32:]
+}
+
+// DecryptString decrypts a base64 encoded string that was encrypted using OpenSSL and AES-256-CBC.
+func DecryptString(passphrase, encryptedBase64String string) (string, error) {
+	text, err := DecryptBase64([]byte(passphrase), []byte(encryptedBase64String))
+	return string(text), err
+}
+
+// DecryptBase64 decrypts a base64 encoded []byte that was encrypted using OpenSSL and AES-256-CBC.
+func DecryptBase64(passphrase, encryptedBase64 []byte) ([]byte, error) {
+	encrypted := make([]byte, base64.StdEncoding.DecodedLen(len(encryptedBase64)))
+	n, err := base64.StdEncoding.Decode(encrypted, encryptedBase64)
+	if err != nil {
+		return nil, err
+	}
+	return Decrypt(passphrase, encrypted[:n])
+}
+
+// Decrypt decrypts a []byte that was encrypted using OpenSSL and AES-256-CBC.
+func Decrypt(passphrase, encrypted []byte) ([]byte, error) {
+	if len(encrypted) < aes.BlockSize {
+		return nil, fmt.Errorf("Cipher data length less than aes block size")
+	}
+	saltHeader := encrypted[:aes.BlockSize]
+	if !bytes.Equal(saltHeader[:8], openSSLSaltHeader) {
+		return nil, fmt.Errorf("Does not appear to have been encrypted with OpenSSL, salt header missing.")
+	}
+	var creds openSSLCreds
+	key, iv := creds.Extract(passphrase, saltHeader[8:])
+
+	if len(encrypted) == 0 || len(encrypted)%aes.BlockSize != 0 {
+		return nil, fmt.Errorf("bad blocksize(%v), aes.BlockSize = %v\n", len(encrypted), aes.BlockSize)
+	}
+	c, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	cbc := cipher.NewCBCDecrypter(c, iv)
+	cbc.CryptBlocks(encrypted[aes.BlockSize:], encrypted[aes.BlockSize:])
+	return pkcs7Unpad(encrypted[aes.BlockSize:])
+}
+
+// EncryptString encrypts a string in a manner compatible to OpenSSL encryption
+// functions using AES-256-CBC as encryption algorithm and encode to base64 format.
+func EncryptString(passphrase, plaintextString string) (string, error) {
+	encryptedBase64, err := EncryptBase64([]byte(passphrase), []byte(plaintextString))
+	return string(encryptedBase64), err
+}
+
+// EncryptBase64 encrypts a []byte in a manner compatible to OpenSSL encryption
+// functions using AES-256-CBC as encryption algorithm and encode to base64 format.
+func EncryptBase64(passphrase, plaintext []byte) ([]byte, error) {
+	encrypted, err := Encrypt(passphrase, plaintext)
+	encryptedBase64 := make([]byte, base64.StdEncoding.EncodedLen(len(encrypted)))
+	base64.StdEncoding.Encode(encryptedBase64, encrypted)
+	return encryptedBase64, err
+}
+
+// Encrypt encrypts a []byte in a manner compatible to OpenSSL encryption
+// functions using AES-256-CBC as encryption algorithm
+func Encrypt(passphrase, plaintext []byte) ([]byte, error) {
+	var salt [8]byte // Generate an 8 byte salt
+	_, err := io.ReadFull(rand.Reader, salt[:])
+	if err != nil {
+		return nil, err
+	}
+
+	data := make([]byte, len(plaintext)+aes.BlockSize)
+	copy(data[0:], openSSLSaltHeader)
+	copy(data[8:], salt[:])
+	copy(data[aes.BlockSize:], plaintext)
+
+	var creds openSSLCreds
+	key, iv := creds.Extract(passphrase, salt[:])
+	encrypted, err := encrypt(key, iv, data)
+	if err != nil {
+		return nil, err
+	}
+	return encrypted, nil
+}
+
+func encrypt(key, iv, data []byte) ([]byte, error) {
+	padded, err := pkcs7Pad(data)
+	if err != nil {
+		return nil, err
+	}
+	c, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	cbc := cipher.NewCBCEncrypter(c, iv)
+	cbc.CryptBlocks(padded[aes.BlockSize:], padded[aes.BlockSize:])
+	return padded, nil
+}
+
+var padPatterns [aes.BlockSize][]byte
+
+func init() {
+	for i := 0; i < len(padPatterns); i++ {
+		padPatterns[i] = bytes.Repeat([]byte{byte(i)}, i)
+	}
+}
+
+// pkcs7Pad appends padding.
+func pkcs7Pad(data []byte) ([]byte, error) {
+	padlen := 1
+	for ((len(data) + padlen) % aes.BlockSize) != 0 {
+		padlen = padlen + 1
+	}
+	return append(data, padPatterns[padlen]...), nil
+}
+
+// pkcs7Unpad returns slice of the original data without padding.
+func pkcs7Unpad(data []byte) ([]byte, error) {
+	if len(data)%aes.BlockSize != 0 || len(data) == 0 {
+		return nil, fmt.Errorf("invalid data len %d", len(data))
+	}
+	padlen := int(data[len(data)-1])
+	if padlen > aes.BlockSize || padlen == 0 {
+		return nil, fmt.Errorf("invalid padding")
+	}
+	if !bytes.Equal(padPatterns[padlen], data[len(data)-padlen:]) {
+		return nil, fmt.Errorf("invalid padding")
+	}
+	return data[:len(data)-padlen], nil
+}

aes256cbc/openssl_test.go → aes256cbc/aes256cbc_test.go

@@ -7,16 +7,22 @@ import (
 	"testing"
 )
 
+func Benchmark_Decrypt(b *testing.B) {
+	opensslEncrypted := []byte("U2FsdGVkX19ZM5qQJGe/d5A/4pccgH+arBGTp+QnWPU=")
+	passphrase := []byte("z4yH36a6zerhfE5427ZV")
+	for i := 0; i < b.N; i++ {
+		DecryptBase64(passphrase, opensslEncrypted)
+	}
+}
+
 func TestDecryptFromString(t *testing.T) {
 	// > echo -n "hallowelt" | openssl aes-256-cbc -pass pass:z4yH36a6zerhfE5427ZV -a -salt
 	// U2FsdGVkX19ZM5qQJGe/d5A/4pccgH+arBGTp+QnWPU=
 
-	opensslEncrypted := []byte("U2FsdGVkX19ZM5qQJGe/d5A/4pccgH+arBGTp+QnWPU=")
-	passphrase := []byte("z4yH36a6zerhfE5427ZV")
-
-	o := New()
+	opensslEncrypted := "U2FsdGVkX19ZM5qQJGe/d5A/4pccgH+arBGTp+QnWPU="
+	passphrase := "z4yH36a6zerhfE5427ZV"
 
-	data, err := o.DecryptString(passphrase, opensslEncrypted)
+	data, err := DecryptString(passphrase, opensslEncrypted)
 
 	if err != nil {
 		t.Fatalf("Test errored: %s", err)
@@ -28,33 +34,29 @@ func TestDecryptFromString(t *testing.T) {
 }
 
 func TestEncryptToDecrypt(t *testing.T) {
-	plaintext := []byte("hallowelt")
-	passphrase := []byte("z4yH36a6zerhfE5427ZV")
+	plaintext := "hallowelt"
+	passphrase := "z4yH36a6zerhfE5427ZV"
 
-	o := New()
-
-	enc, err := o.EncryptString(passphrase, plaintext)
+	enc, err := EncryptString(passphrase, plaintext)
 	if err != nil {
 		t.Fatalf("Test errored at encrypt: %s", err)
 	}
 
-	dec, err := o.DecryptString(passphrase, enc)
+	dec, err := DecryptString(passphrase, string(enc))
 	if err != nil {
 		t.Fatalf("Test errored at decrypt: %s", err)
 	}
 
-	if !bytes.Equal(dec, plaintext) {
+	if string(dec) != plaintext {
 		t.Errorf("Decrypted text did not match input.")
 	}
 }
 
 func TestEncryptToOpenSSL(t *testing.T) {
-	plaintext := []byte("hallowelt")
-	passphrase := []byte("z4yH36a6zerhfE5427ZV")
-
-	o := New()
+	plaintext := "hallowelt"
+	passphrase := "z4yH36a6zerhfE5427ZV"
 
-	enc, err := o.EncryptString(passphrase, plaintext)
+	enc, err := EncryptString(passphrase, plaintext)
 	if err != nil {
 		t.Fatalf("Test errored at encrypt: %s", err)
 	}
@@ -71,7 +73,7 @@ func TestEncryptToOpenSSL(t *testing.T) {
 		t.Errorf("OpenSSL errored: %s", err)
 	}
 
-	if !bytes.Equal(out.Bytes(), plaintext) {
+	if out.String() != plaintext {
 		t.Errorf("OpenSSL output did not match input.\nOutput was: %s", out.String())
 	}
 }

aes256cbc/examples_test.go

@@ -0,0 +1,30 @@
+package aes256cbc
+
+import "fmt"
+
+func ExampleEncryptString() {
+	plaintext := "Hello World!"
+	passphrase := "z4yH36a6zerhfE5427ZV"
+
+	enc, err := EncryptString(passphrase, plaintext)
+	if err != nil {
+		fmt.Printf("An error occurred: %s\n", err)
+	}
+
+	fmt.Printf("Encrypted text: %s\n", string(enc))
+}
+
+func ExampleDecryptString() {
+	opensslEncrypted := "U2FsdGVkX19ZM5qQJGe/d5A/4pccgH+arBGTp+QnWPU="
+	passphrase := "z4yH36a6zerhfE5427ZV"
+
+	dec, err := DecryptString(passphrase, opensslEncrypted)
+	if err != nil {
+		fmt.Printf("An error occurred: %s\n", err)
+	}
+
+	fmt.Printf("Decrypted text: %s\n", string(dec))
+
+	// Output:
+	// Decrypted text: hallowelt
+}