Merge remote-tracking branch 'origin/develop' into develop

2 files changed, 73 insertions, 25 deletions

diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json
new file mode 100644
index 000000000..86d5efe48
--- /dev/null
+++ b/KeyStoreTests/basic_tests.json
@@ -0,0 +1,73 @@
+{
+    "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"
+    },
+    "python_generated_test_with_odd_iv": {
+        "json": {
+            "version": 2, 
+            "crypto": {
+                "ciphertext": "0e5b5c03f17a15175a6ed41a19bc16ef7fe5938dcd392c29a37ee8ce2731572e", 
+                "cipherparams": {
+                    "iv": "76e92c4c83f7abcb30383535950c8faf"
+                }, 
+                "kdf": "pbkdf2", 
+                "kdfparams": {
+                    "dklen": 32, 
+                    "c": 262144, 
+                    "prf": "hmac-sha256", 
+                    "salt": "e29b45cb3340c7f1ee4e2ba55396f4fd"
+                }, 
+                "mac": "39b054110eeebb2bd0ef1df2808878bb579a6145be8b69d7234177801eb8b8af", 
+                "cipher": "aes-128-ctr", 
+                "version": 1
+            }, 
+            "id": "py-wallet-7df9912edf81698291f5"
+        }, 
+        "password": "foo", 
+        "priv": "0101010101010101010101010101010101010101010101010101010101010101"
+    }
+}
diff --git a/KeyStoreTests/pbkdf2_test.json b/KeyStoreTests/pbkdf2_test.json
deleted file mode 100644
index 1f0653259..000000000
--- a/KeyStoreTests/pbkdf2_test.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "test1": {
-        "json": {
-            "crypto" : {
-                "cipher" : "aes-128-cbc",
-                "cipherparams" : {
-                    "iv" : "db76cba2e79171364c5d5378190062c8"
-                },
-                "ciphertext" : "e8ae879315e349d8804a779421b26d95d2d3195fcf6c4039ee5323b858f53ef3",
-                "kdf" : "pbkdf2",
-                "kdfparams" : {
-                    "c" : 262144,
-                    "dklen" : 16,
-                    "prf" : "hmac-sha256",
-                    "salt" : "de5742f1f1045c402296422cee5a8a9ecf0ac5bf594deca1170d22aef33a79cf"
-                },
-                "mac" : "340aed34a9229210bfb7a5731268d78c68dba5e78a5a4eb87ff6e28bf2952735"
-            },
-            "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6",
-            "version" : 2
-        },
-        "password": "testpassword",
-        "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d"
-    }
-}