From 1f8290ca44df31cc4c4b68b30eef412476ed24e0 Mon Sep 17 00:00:00 2001
From: Gustav Simonsson <gustav.simonsson@gmail.com>
Date: Tue, 20 Jan 2015 23:55:13 +0100
Subject: Add ImportPreSaleKey

* ImportPreSaleKey takes a KeyStore, a presale key JSON (e.g. file content)
  and a password string. It stores the key in the given key store.
* Refactored common AES decryption and moved some functions to crypto.go
---
 crypto/key_store_passphrase.go | 46 +-----------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

(limited to 'crypto/key_store_passphrase.go')

diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go
index e30a0a785..913b68498 100644
--- a/crypto/key_store_passphrase.go
+++ b/crypto/key_store_passphrase.go
@@ -178,22 +178,10 @@ func DecryptKey(ks keyStorePassphrase, keyId *uuid.UUID, auth string) (keyBytes
 	if err != nil {
 		return nil, err
 	}
-
-	AES256Block, err := aes.NewCipher(derivedKey)
+	plainText, err := aes_cbc_decrypt(derivedKey, cipherText, iv)
 	if err != nil {
 		return nil, err
 	}
-
-	AES256CBCDecrypter := cipher.NewCBCDecrypter(AES256Block, iv)
-	paddedPlainText := make([]byte, len(cipherText))
-	AES256CBCDecrypter.CryptBlocks(paddedPlainText, cipherText)
-
-	plainText := PKCS7Unpad(paddedPlainText)
-	if plainText == nil {
-		err = errors.New("Decryption failed: PKCS7Unpad failed after decryption")
-		return nil, err
-	}
-
 	keyBytes = plainText[:len(plainText)-32]
 	keyBytesHash := plainText[len(plainText)-32:]
 	if !bytes.Equal(Sha3(keyBytes), keyBytesHash) {
@@ -211,35 +199,3 @@ func getEntropyCSPRNG(n int) []byte {
 	}
 	return mainBuff
 }
-
-// From https://leanpub.com/gocrypto/read#leanpub-auto-block-cipher-modes
-func PKCS7Pad(in []byte) []byte {
-	padding := 16 - (len(in) % 16)
-	if padding == 0 {
-		padding = 16
-	}
-	for i := 0; i < padding; i++ {
-		in = append(in, byte(padding))
-	}
-	return in
-}
-
-func PKCS7Unpad(in []byte) []byte {
-	if len(in) == 0 {
-		return nil
-	}
-
-	padding := in[len(in)-1]
-	if int(padding) > len(in) || padding > aes.BlockSize {
-		return nil
-	} else if padding == 0 {
-		return nil
-	}
-
-	for i := len(in) - 1; i > len(in)-int(padding)-1; i-- {
-		if in[i] != padding {
-			return nil
-		}
-	}
-	return in[:len(in)-int(padding)]
-}
-- 
cgit 


From 8af42d42da1d428025622d3b76982798ec9436bd Mon Sep 17 00:00:00 2001
From: Gustav Simonsson <gustav.simonsson@gmail.com>
Date: Wed, 21 Jan 2015 19:08:05 +0100
Subject: CamelCase aesCBCDecrypt

---
 crypto/key_store_passphrase.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crypto/key_store_passphrase.go')

diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go
index 913b68498..80bf49d68 100644
--- a/crypto/key_store_passphrase.go
+++ b/crypto/key_store_passphrase.go
@@ -178,7 +178,7 @@ func DecryptKey(ks keyStorePassphrase, keyId *uuid.UUID, auth string) (keyBytes
 	if err != nil {
 		return nil, err
 	}
-	plainText, err := aes_cbc_decrypt(derivedKey, cipherText, iv)
+	plainText, err := aesCBCDecrypt(derivedKey, cipherText, iv)
 	if err != nil {
 		return nil, err
 	}
-- 
cgit