diff options
| author | Gustav Simonsson <gustav.simonsson@gmail.com> | 2016-09-24 03:42:29 +0800 |
|---|---|---|
| committer | Gustav Simonsson <gustav.simonsson@gmail.com> | 2016-09-28 01:07:33 +0800 |
| commit | 7cc6b801e0967e5ebfa26b9f670675acea6e3a20 (patch) | |
| tree | 4f27977539b92569659c67751c4d4a209d6af95f | |
| parent | 863d166c7b0250cf2e99c8aad69578cdd144d386 (diff) | |
| download | dexon-7cc6b801e0967e5ebfa26b9f670675acea6e3a20.tar.gz dexon-7cc6b801e0967e5ebfa26b9f670675acea6e3a20.tar.zst dexon-7cc6b801e0967e5ebfa26b9f670675acea6e3a20.zip | |
accounts: left pad keybytes-to-encrypt, add 30/31 byte keys tests
| -rw-r--r-- | accounts/key_store_passphrase.go | 3 | ||||
| -rw-r--r-- | accounts/key_store_test.go | 12 | ||||
| -rw-r--r-- | accounts/testdata/v3_test_vector.json | 48 |
3 files changed, 62 insertions, 1 deletions
diff --git a/accounts/key_store_passphrase.go b/accounts/key_store_passphrase.go index 87c7cb98f..3a5155e13 100644 --- a/accounts/key_store_passphrase.go +++ b/accounts/key_store_passphrase.go @@ -107,7 +107,8 @@ func EncryptKey(key *Key, auth string, scryptN, scryptP int) ([]byte, error) { return nil, err } encryptKey := derivedKey[:16] - keyBytes := crypto.FromECDSA(key.PrivateKey) + keyBytes0 := crypto.FromECDSA(key.PrivateKey) + keyBytes := common.LeftPadBytes(keyBytes0, 32) iv := randentropy.GetEntropyCSPRNG(aes.BlockSize) // 16 cipherText, err := aesCTRXOR(encryptKey, keyBytes, iv) diff --git a/accounts/key_store_test.go b/accounts/key_store_test.go index b0417c87e..d0713caa0 100644 --- a/accounts/key_store_test.go +++ b/accounts/key_store_test.go @@ -239,3 +239,15 @@ func TestKeyForDirectICAP(t *testing.T) { t.Errorf("Expected first address byte to be zero, have: %s", key.Address.Hex()) } } + +func TestV3_31_Byte_Key(t *testing.T) { + t.Parallel() + tests := loadKeyStoreTestV3("testdata/v3_test_vector.json", t) + testDecryptV3(tests["31_byte_key"], t) +} + +func TestV3_30_Byte_Key(t *testing.T) { + t.Parallel() + tests := loadKeyStoreTestV3("testdata/v3_test_vector.json", t) + testDecryptV3(tests["30_byte_key"], t) +} diff --git a/accounts/testdata/v3_test_vector.json b/accounts/testdata/v3_test_vector.json index e9d7b62f0..1e7f790c0 100644 --- a/accounts/testdata/v3_test_vector.json +++ b/accounts/testdata/v3_test_vector.json @@ -45,5 +45,53 @@ }, "password": "testpassword", "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d" + }, + "31_byte_key": { + "json": { + "crypto" : { + "cipher" : "aes-128-ctr", + "cipherparams" : { + "iv" : "e0c41130a323adc1446fc82f724bca2f" + }, + "ciphertext" : "9517cd5bdbe69076f9bf5057248c6c050141e970efa36ce53692d5d59a3984", + "kdf" : "scrypt", + "kdfparams" : { + "dklen" : 32, + "n" : 2, + "r" : 8, + "p" : 1, + "salt" : "711f816911c92d649fb4c84b047915679933555030b3552c1212609b38208c63" + }, + "mac" : "d5e116151c6aa71470e67a7d42c9620c75c4d23229847dcc127794f0732b0db5" + }, + "id" : "fecfc4ce-e956-48fd-953b-30f8b52ed66c", + "version" : 3 + }, + "password": "foo", + "priv": "fa7b3db73dc7dfdf8c5fbdb796d741e4488628c41fc4febd9160a866ba0f35" + }, + "30_byte_key": { + "json": { + "crypto" : { + "cipher" : "aes-128-ctr", + "cipherparams" : { + "iv" : "3ca92af36ad7c2cd92454c59cea5ef00" + }, + "ciphertext" : "108b7d34f3442fc26ab1ab90ca91476ba6bfa8c00975a49ef9051dc675aa", + "kdf" : "scrypt", + "kdfparams" : { + "dklen" : 32, + "n" : 2, + "r" : 8, + "p" : 1, + "salt" : "d0769e608fb86cda848065642a9c6fa046845c928175662b8e356c77f914cd3b" + }, + "mac" : "75d0e6759f7b3cefa319c3be41680ab6beea7d8328653474bd06706d4cc67420" + }, + "id" : "a37e1559-5955-450d-8075-7b8931b392b2", + "version" : 3 + }, + "password": "foo", + "priv": "81c29e8142bb6a81bef5a92bda7a8328a5c85bb2f9542e76f9b0f94fc018" } } |