aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCJentzsch <jentzsch.software@gmail.com>2015-05-26 07:07:39 +0800
committerCJentzsch <jentzsch.software@gmail.com>2015-05-26 07:07:39 +0800
commitc3cb6df9b210a78624d43450e3faab5ab0bba292 (patch)
treefabefe6044292b541a72198830a6d1515ed60013
parent326ad0a750dbdbea278909507fe596eb030a9cf6 (diff)
parent1b7bb22c3b7c9b550de058f490846cc0bea8ecfa (diff)
downloadtangerine-tests-c3cb6df9b210a78624d43450e3faab5ab0bba292.tar
tangerine-tests-c3cb6df9b210a78624d43450e3faab5ab0bba292.tar.gz
tangerine-tests-c3cb6df9b210a78624d43450e3faab5ab0bba292.tar.bz2
tangerine-tests-c3cb6df9b210a78624d43450e3faab5ab0bba292.tar.lz
tangerine-tests-c3cb6df9b210a78624d43450e3faab5ab0bba292.tar.xz
tangerine-tests-c3cb6df9b210a78624d43450e3faab5ab0bba292.tar.zst
tangerine-tests-c3cb6df9b210a78624d43450e3faab5ab0bba292.zip
Merge remote-tracking branch 'origin' into develop
-rw-r--r--KeyStoreTests/basic_tests.json42
1 files changed, 33 insertions, 9 deletions
diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json
index 86d5efe48..8b40d33b0 100644
--- a/KeyStoreTests/basic_tests.json
+++ b/KeyStoreTests/basic_tests.json
@@ -48,26 +48,50 @@
},
"python_generated_test_with_odd_iv": {
"json": {
- "version": 2,
+ "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": "514ccc8c4fb3e60e5538e0cf1e27c233"
+ },
+ "cipher": "aes-128-ctr"
+ },
+ "id": "98d193c7-5174-4c7c-5345-c1daf95477b5"
+ },
+ "password": "foo",
+ "priv": "0101010101010101010101010101010101010101010101010101010101010101"
+ },
+ "evilnonce": {
+ "json": {
+ "version": 3,
+ "crypto": {
+ "ciphertext": "d69313b6470ac1942f75d72ebf8818a0d484ac78478a132ee081cd954d6bd7a9",
"cipherparams": {
- "iv": "76e92c4c83f7abcb30383535950c8faf"
+ "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": "py-wallet-7df9912edf81698291f5"
- },
- "password": "foo",
- "priv": "0101010101010101010101010101010101010101010101010101010101010101"
+ "id": "abb67040-8dbe-0dad-fc39-2b082ef0ee5f"
+ },
+ "password": "bar",
+ "priv": "0202020202020202020202020202020202020202020202020202020202020202"
}
}