diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-03-13 14:59:26 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-03-13 14:59:26 +0800 |
| commit | b9149b5e91ea072ab9b950b223e04584f67fb77e (patch) | |
| tree | cae326658b64bf971520740569f2d219a37a4831 | |
| parent | 5bea708c12c4f747637babe5594f3ba46f3a4bf0 (diff) | |
| parent | 478a07d8c44a92978ff4d9416160c8eae42fadb0 (diff) | |
| download | tangerine-tests-b9149b5e91ea072ab9b950b223e04584f67fb77e.tar tangerine-tests-b9149b5e91ea072ab9b950b223e04584f67fb77e.tar.gz tangerine-tests-b9149b5e91ea072ab9b950b223e04584f67fb77e.tar.bz2 tangerine-tests-b9149b5e91ea072ab9b950b223e04584f67fb77e.tar.lz tangerine-tests-b9149b5e91ea072ab9b950b223e04584f67fb77e.tar.xz tangerine-tests-b9149b5e91ea072ab9b950b223e04584f67fb77e.tar.zst tangerine-tests-b9149b5e91ea072ab9b950b223e04584f67fb77e.zip | |
Merge remote-tracking branch 'origin/develop' into develop
| -rw-r--r-- | BasicTests/crypto.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BasicTests/crypto.json b/BasicTests/crypto.json index e53242c49..64a4f8842 100644 --- a/BasicTests/crypto.json +++ b/BasicTests/crypto.json @@ -4,7 +4,7 @@ "key": "abb51256c1324a1350598653f46aa3ad693ac3cf5d05f36eba3f495a1f51590f", "cipher": "84a727bc81fa4b13947dc9728b88fd08", "payload": "000102030405060708090a0b0c0d0e0f" - } + }, "ecies1": { "decryption_type": "ecies_sec1_altered", |