correct/update exposed function name

aes256cbc/openssl.go

@@ -31,8 +31,9 @@ func New() *OpenSSL {
 	}
 }
 
-// DecryptString decrypts a string that was encrypted using OpenSSL and AES-256-CBC
-func (o *OpenSSL) DecryptString(passphrase, encryptedBase64String []byte) ([]byte, error) {
+// Decrypt a string that was encrypted using OpenSSL and AES-256-CBC
+// also compatible with crptojs
+func (o *OpenSSL) Decrypt(passphrase, encryptedBase64String []byte) ([]byte, error) {
 	dbuf := make([]byte, base64.StdEncoding.DecodedLen(len(encryptedBase64String)))
 	n, err := base64.StdEncoding.Decode(dbuf, encryptedBase64String)
 	if err != nil {
@@ -67,9 +68,10 @@ func (o *OpenSSL) decrypt(key, iv, data []byte) ([]byte, error) {
 	return out, nil
 }
 
-// EncryptString encrypts a string in a manner compatible to OpenSSL encryption
+// Encrypt a string in a manner compatible to OpenSSL encryption
 // functions using AES-256-CBC as encryption algorithm
-func (o *OpenSSL) EncryptString(passphrase, plaintextString []byte) ([]byte, error) {
+// also compatible with crptojs from https://code.google.com/p/crypto-js/
+func (o *OpenSSL) Encrypt(passphrase, plaintextString []byte) ([]byte, error) {
 	salt := make([]byte, 8) // Generate an 8 byte salt
 	_, err := io.ReadFull(rand.Reader, salt)
 	if err != nil {

aes256cbc/openssl_test.go

@@ -16,7 +16,7 @@ func TestDecryptFromString(t *testing.T) {
 
 	o := New()
 
-	data, err := o.DecryptString(passphrase, opensslEncrypted)
+	data, err := o.Decrypt(passphrase, opensslEncrypted)
 
 	if err != nil {
 		t.Fatalf("Test errored: %s", err)
@@ -33,12 +33,12 @@ func TestEncryptToDecrypt(t *testing.T) {
 
 	o := New()
 
-	enc, err := o.EncryptString(passphrase, plaintext)
+	enc, err := o.Encrypt(passphrase, plaintext)
 	if err != nil {
 		t.Fatalf("Test errored at encrypt: %s", err)
 	}
 
-	dec, err := o.DecryptString(passphrase, enc)
+	dec, err := o.Decrypt(passphrase, enc)
 	if err != nil {
 		t.Fatalf("Test errored at decrypt: %s", err)
 	}
@@ -54,7 +54,7 @@ func TestEncryptToOpenSSL(t *testing.T) {
 
 	o := New()
 
-	enc, err := o.EncryptString(passphrase, plaintext)
+	enc, err := o.Encrypt(passphrase, plaintext)
 	if err != nil {
 		t.Fatalf("Test errored at encrypt: %s", err)
 	}

main.go

@@ -49,7 +49,7 @@ func decryptBackendAddr(line []byte) ([]byte, error) {
 		return addr, nil
 	}
 	// Try to decrypt it (AES)
-	addr, err := _Aes256CBC.DecryptString(_SecretPassphase, line)
+	addr, err := _Aes256CBC.Decrypt(_SecretPassphase, line)
 	if err != nil {
 		return nil, err
 	}

main_test.go

@@ -73,7 +73,7 @@ func TestMain(m *testing.M) {
 func TestTextDecryptAES(t *testing.T) {
 	o := aes256cbc.New()
 
-	dec, err := o.DecryptString(_secret, _expectAESCiphertext)
+	dec, err := o.Decrypt(_secret, _expectAESCiphertext)
 	if err != nil {
 		panic(err)
 	}
@@ -85,7 +85,7 @@ func TestTextDecryptAES(t *testing.T) {
 func encryptText(plaintext, passphrase []byte) ([]byte, error) {
 	o := aes256cbc.New()
 
-	return o.EncryptString(passphrase, plaintext)
+	return o.Encrypt(passphrase, plaintext)
 }
 
 func randomBytes(n int) []byte {
@@ -186,7 +186,7 @@ func BenchmarkEncryptText(b *testing.B) {
 func BenchmarkDecryptText(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		o := aes256cbc.New()
-		_, err := o.DecryptString(_secret, _expectAESCiphertext)
+		_, err := o.Decrypt(_secret, _expectAESCiphertext)
 		if err != nil {
 			panic(err)
 		}