From 4681c8ef7578e0cccb1b4a49a6b813317663f342 Mon Sep 17 00:00:00 2001 From: Vitalik Buterin Date: Sun, 24 May 2015 08:46:47 -0400 Subject: Updated py generated test --- KeyStoreTests/basic_tests.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json index 86d5efe48..91823abb0 100644 --- a/KeyStoreTests/basic_tests.json +++ b/KeyStoreTests/basic_tests.json @@ -48,7 +48,7 @@ }, "python_generated_test_with_odd_iv": { "json": { - "version": 2, + "version": 3, "crypto": { "ciphertext": "0e5b5c03f17a15175a6ed41a19bc16ef7fe5938dcd392c29a37ee8ce2731572e", "cipherparams": { @@ -65,7 +65,7 @@ "cipher": "aes-128-ctr", "version": 1 }, - "id": "py-wallet-7df9912edf81698291f5" + "id": "4216d9d6-9d2c-da0f-b848-270c0403a85f" }, "password": "foo", "priv": "0101010101010101010101010101010101010101010101010101010101010101" -- cgit v1.2.3 From ca92b231cd41506f3303363edbb7a0f887cb621b Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sun, 24 May 2015 13:56:47 +0100 Subject: Fix for keystore format. --- KeyStoreTests/basic_tests.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json index 86d5efe48..680e830b9 100644 --- a/KeyStoreTests/basic_tests.json +++ b/KeyStoreTests/basic_tests.json @@ -48,7 +48,7 @@ }, "python_generated_test_with_odd_iv": { "json": { - "version": 2, + "version": 3, "crypto": { "ciphertext": "0e5b5c03f17a15175a6ed41a19bc16ef7fe5938dcd392c29a37ee8ce2731572e", "cipherparams": { @@ -62,10 +62,9 @@ "salt": "e29b45cb3340c7f1ee4e2ba55396f4fd" }, "mac": "39b054110eeebb2bd0ef1df2808878bb579a6145be8b69d7234177801eb8b8af", - "cipher": "aes-128-ctr", - "version": 1 + "cipher": "aes-128-ctr" }, - "id": "py-wallet-7df9912edf81698291f5" + "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6" }, "password": "foo", "priv": "0101010101010101010101010101010101010101010101010101010101010101" -- cgit v1.2.3 From b7a955f878a1a3e0c03ca315c89008602f31ab07 Mon Sep 17 00:00:00 2001 From: Vitalik Buterin Date: Sun, 24 May 2015 09:02:18 -0400 Subject: Updated one test and added another for keys --- KeyStoreTests/basic_tests.json | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json index 91823abb0..8b40d33b0 100644 --- a/KeyStoreTests/basic_tests.json +++ b/KeyStoreTests/basic_tests.json @@ -50,24 +50,48 @@ "json": { "version": 3, "crypto": { - "ciphertext": "0e5b5c03f17a15175a6ed41a19bc16ef7fe5938dcd392c29a37ee8ce2731572e", + "ciphertext": "ee75456c006b1e468133c5d2a916bacd3cf515ced4d9b021b5c59978007d1e87", + "version": 1, + "kdf": "pbkdf2", + "kdfparams": { + "dklen": 32, + "c": 262144, + "prf": "hmac-sha256", + "salt": "504490577620f64f43d73f29479c2cf0" + }, + "mac": "196815708465de9af7504144a1360d08874fc3c30bb0e648ce88fbc36830d35d", "cipherparams": { - "iv": "76e92c4c83f7abcb30383535950c8faf" + "iv": "514ccc8c4fb3e60e5538e0cf1e27c233" + }, + "cipher": "aes-128-ctr" + }, + "id": "98d193c7-5174-4c7c-5345-c1daf95477b5" + }, + "password": "foo", + "priv": "0101010101010101010101010101010101010101010101010101010101010101" + }, + "evilnonce": { + "json": { + "version": 3, + "crypto": { + "ciphertext": "d69313b6470ac1942f75d72ebf8818a0d484ac78478a132ee081cd954d6bd7a9", + "cipherparams": { + "iv": "ffffffffffffffffffffffffffffffff" }, "kdf": "pbkdf2", "kdfparams": { "dklen": 32, "c": 262144, "prf": "hmac-sha256", - "salt": "e29b45cb3340c7f1ee4e2ba55396f4fd" + "salt": "c82ef14476014cbf438081a42709e2ed" }, - "mac": "39b054110eeebb2bd0ef1df2808878bb579a6145be8b69d7234177801eb8b8af", + "mac": "cf6bfbcc77142a22c4a908784b4a16f1023a1d0e2aff404c20158fa4f1587177", "cipher": "aes-128-ctr", "version": 1 }, - "id": "4216d9d6-9d2c-da0f-b848-270c0403a85f" - }, - "password": "foo", - "priv": "0101010101010101010101010101010101010101010101010101010101010101" + "id": "abb67040-8dbe-0dad-fc39-2b082ef0ee5f" + }, + "password": "bar", + "priv": "0202020202020202020202020202020202020202020202020202020202020202" } } -- cgit v1.2.3