From 979756ff39cc7f64d91398b4c0e40817bede8ce1 Mon Sep 17 00:00:00 2001 From: Vitalik Buterin Date: Thu, 21 May 2015 21:22:33 -0400 Subject: Updated pbkdf2 tests and added a scrypt test --- KeyStoreTests/pbkdf2_test.json | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/KeyStoreTests/pbkdf2_test.json b/KeyStoreTests/pbkdf2_test.json index 1f0653259..183013166 100644 --- a/KeyStoreTests/pbkdf2_test.json +++ b/KeyStoreTests/pbkdf2_test.json @@ -2,22 +2,46 @@ "test1": { "json": { "crypto" : { - "cipher" : "aes-128-cbc", + "cipher" : "aes-128-ctr", "cipherparams" : { - "iv" : "db76cba2e79171364c5d5378190062c8" + "iv" : "6087dab2f9fdbbfaddc31a909735c1e6" }, - "ciphertext" : "e8ae879315e349d8804a779421b26d95d2d3195fcf6c4039ee5323b858f53ef3", + "ciphertext" : "5318b4d5bcd28de64ee5559e671353e16f075ecae9f99c7a79a38af5f869aa46", "kdf" : "pbkdf2", "kdfparams" : { "c" : 262144, - "dklen" : 16, + "dklen" : 32, "prf" : "hmac-sha256", - "salt" : "de5742f1f1045c402296422cee5a8a9ecf0ac5bf594deca1170d22aef33a79cf" + "salt" : "ae3cd4e7013836a3df6bd7241b12db061dbe2c6785853cce422d148a624ce0bd" }, - "mac" : "340aed34a9229210bfb7a5731268d78c68dba5e78a5a4eb87ff6e28bf2952735" + "mac" : "517ead924a9d0dc3124507e3393d175ce3ff7c1e96529c6c555ce9e51205e9b2" }, "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6", - "version" : 2 + "version" : 3 + }, + "password": "testpassword", + "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d" + }, + "test2": { + "json": { + "crypto" : { + "cipher" : "aes-128-ctr", + "cipherparams" : { + "iv" : "83dbcc02d8ccb40e466191a123791e0e" + }, + "ciphertext" : "d172bf743a674da9cdad04534d56926ef8358534d458fffccd4e6ad2fbde479c", + "kdf" : "scrypt", + "kdfparams" : { + "dklen" : 32, + "n" : 262144, + "r" : 1, + "p" : 8, + "salt" : "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19" + }, + "mac" : "2103ac29920d71da29f15d75b4a16dbe95cfd7ff8faea1056c33131d846e3097" + }, + "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6", + "version" : 3 }, "password": "testpassword", "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d" -- cgit v1.2.3 From 2c9728f3801d05a0bd32de0295f605e5389706d0 Mon Sep 17 00:00:00 2001 From: Vitalik Buterin Date: Thu, 21 May 2015 21:23:15 -0400 Subject: Renamed key store file to reflect that it contains both pbkdf2 and scrypt tests --- KeyStoreTests/basic_tests.json | 49 ++++++++++++++++++++++++++++++++++++++++++ KeyStoreTests/pbkdf2_test.json | 49 ------------------------------------------ 2 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 KeyStoreTests/basic_tests.json delete mode 100644 KeyStoreTests/pbkdf2_test.json diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json new file mode 100644 index 000000000..183013166 --- /dev/null +++ b/KeyStoreTests/basic_tests.json @@ -0,0 +1,49 @@ +{ + "test1": { + "json": { + "crypto" : { + "cipher" : "aes-128-ctr", + "cipherparams" : { + "iv" : "6087dab2f9fdbbfaddc31a909735c1e6" + }, + "ciphertext" : "5318b4d5bcd28de64ee5559e671353e16f075ecae9f99c7a79a38af5f869aa46", + "kdf" : "pbkdf2", + "kdfparams" : { + "c" : 262144, + "dklen" : 32, + "prf" : "hmac-sha256", + "salt" : "ae3cd4e7013836a3df6bd7241b12db061dbe2c6785853cce422d148a624ce0bd" + }, + "mac" : "517ead924a9d0dc3124507e3393d175ce3ff7c1e96529c6c555ce9e51205e9b2" + }, + "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6", + "version" : 3 + }, + "password": "testpassword", + "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d" + }, + "test2": { + "json": { + "crypto" : { + "cipher" : "aes-128-ctr", + "cipherparams" : { + "iv" : "83dbcc02d8ccb40e466191a123791e0e" + }, + "ciphertext" : "d172bf743a674da9cdad04534d56926ef8358534d458fffccd4e6ad2fbde479c", + "kdf" : "scrypt", + "kdfparams" : { + "dklen" : 32, + "n" : 262144, + "r" : 1, + "p" : 8, + "salt" : "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19" + }, + "mac" : "2103ac29920d71da29f15d75b4a16dbe95cfd7ff8faea1056c33131d846e3097" + }, + "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6", + "version" : 3 + }, + "password": "testpassword", + "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d" + } +} diff --git a/KeyStoreTests/pbkdf2_test.json b/KeyStoreTests/pbkdf2_test.json deleted file mode 100644 index 183013166..000000000 --- a/KeyStoreTests/pbkdf2_test.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "test1": { - "json": { - "crypto" : { - "cipher" : "aes-128-ctr", - "cipherparams" : { - "iv" : "6087dab2f9fdbbfaddc31a909735c1e6" - }, - "ciphertext" : "5318b4d5bcd28de64ee5559e671353e16f075ecae9f99c7a79a38af5f869aa46", - "kdf" : "pbkdf2", - "kdfparams" : { - "c" : 262144, - "dklen" : 32, - "prf" : "hmac-sha256", - "salt" : "ae3cd4e7013836a3df6bd7241b12db061dbe2c6785853cce422d148a624ce0bd" - }, - "mac" : "517ead924a9d0dc3124507e3393d175ce3ff7c1e96529c6c555ce9e51205e9b2" - }, - "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6", - "version" : 3 - }, - "password": "testpassword", - "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d" - }, - "test2": { - "json": { - "crypto" : { - "cipher" : "aes-128-ctr", - "cipherparams" : { - "iv" : "83dbcc02d8ccb40e466191a123791e0e" - }, - "ciphertext" : "d172bf743a674da9cdad04534d56926ef8358534d458fffccd4e6ad2fbde479c", - "kdf" : "scrypt", - "kdfparams" : { - "dklen" : 32, - "n" : 262144, - "r" : 1, - "p" : 8, - "salt" : "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19" - }, - "mac" : "2103ac29920d71da29f15d75b4a16dbe95cfd7ff8faea1056c33131d846e3097" - }, - "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6", - "version" : 3 - }, - "password": "testpassword", - "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d" - } -} -- cgit v1.2.3 From dd27b659258cf56118a868b3276a5d2b5f451b63 Mon Sep 17 00:00:00 2001 From: Vitalik Buterin Date: Thu, 21 May 2015 21:30:13 -0400 Subject: Added one more key store test --- KeyStoreTests/basic_tests.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json index 183013166..a626d1350 100644 --- a/KeyStoreTests/basic_tests.json +++ b/KeyStoreTests/basic_tests.json @@ -45,5 +45,29 @@ }, "password": "testpassword", "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d" + }, + "python_generated_test_with_odd_iv": { + "json": { + "version": 2, + "crypto": { + "ciphertext": "49402720c5310f964b186f1aeb9d10d3e1ab21b292bbe0259bf6722804f4a874", + "cipherparams": { + "iv": "e07e1eef3f860cf9394f7e7feaaf28bf" + }, + "kdf": "pbkdf2", + "kdfparams": { + "dklen": 32, + "c": 262144, + "prf": "hmac-sha256", + "salt": "137a9e7f04ed8673cb94f1507c1e5f88" + }, + "mac": "bd21a5904f49d3aaa4a7a8e572b5b11abc97a1f43b02e933f32f611d0d349c37", + "cipher": "aes-128-ctr", + "version": 1 + }, + "id": "" + }, + "password": "foo", + "priv": "0101010101010101010101010101010101010101010101010101010101010101" } } -- cgit v1.2.3 From 452a2a00f14d4c10bbad1dfb7abf54db2af2838e Mon Sep 17 00:00:00 2001 From: Vitalik Buterin Date: Fri, 22 May 2015 10:48:51 -0400 Subject: Updated CTR test to use XOR --- KeyStoreTests/basic_tests.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json index a626d1350..86d5efe48 100644 --- a/KeyStoreTests/basic_tests.json +++ b/KeyStoreTests/basic_tests.json @@ -50,22 +50,22 @@ "json": { "version": 2, "crypto": { - "ciphertext": "49402720c5310f964b186f1aeb9d10d3e1ab21b292bbe0259bf6722804f4a874", + "ciphertext": "0e5b5c03f17a15175a6ed41a19bc16ef7fe5938dcd392c29a37ee8ce2731572e", "cipherparams": { - "iv": "e07e1eef3f860cf9394f7e7feaaf28bf" + "iv": "76e92c4c83f7abcb30383535950c8faf" }, "kdf": "pbkdf2", "kdfparams": { "dklen": 32, "c": 262144, "prf": "hmac-sha256", - "salt": "137a9e7f04ed8673cb94f1507c1e5f88" + "salt": "e29b45cb3340c7f1ee4e2ba55396f4fd" }, - "mac": "bd21a5904f49d3aaa4a7a8e572b5b11abc97a1f43b02e933f32f611d0d349c37", + "mac": "39b054110eeebb2bd0ef1df2808878bb579a6145be8b69d7234177801eb8b8af", "cipher": "aes-128-ctr", "version": 1 }, - "id": "" + "id": "py-wallet-7df9912edf81698291f5" }, "password": "foo", "priv": "0101010101010101010101010101010101010101010101010101010101010101" -- cgit v1.2.3