aboutsummaryrefslogtreecommitdiff
path: root/tests/unit_tests/serialization.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-12-25 22:00:44 +0200
committerRiccardo Spagni <ric@spagni.net>2017-12-25 22:00:44 +0200
commitca8c7e863f418de5a8bf7dc4327099ea1bd00245 (patch)
tree3e2f7983fd7b7ab691113925db8d624a536f000e /tests/unit_tests/serialization.cpp
parent0a5bfa7c732935f24a5d81b04056129a3775bb14 (diff)
parent5ad312a1c3c0491444338758119f332030b8fa2c (diff)
downloadmonzero-core-ca8c7e863f418de5a8bf7dc4327099ea1bd00245.tar.gz
monzero-core-ca8c7e863f418de5a8bf7dc4327099ea1bd00245.tar.xz
monzero-core-ca8c7e863f418de5a8bf7dc4327099ea1bd00245.zip
Merge pull request #2895
5ad312a1 wallet2: switch to chacha20 instead of chacha8 (moneromooo-monero) 1e5491e9 Add a chacha20 variant to go with chacha8 (moneromooo-monero)
Diffstat (limited to 'tests/unit_tests/serialization.cpp')
-rw-r--r--tests/unit_tests/serialization.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit_tests/serialization.cpp b/tests/unit_tests/serialization.cpp
index 9e76efadf..2ef1097da 100644
--- a/tests/unit_tests/serialization.cpp
+++ b/tests/unit_tests/serialization.cpp
@@ -802,12 +802,12 @@ TEST(Serialization, portability_outputs)
// decrypt (copied from wallet2::decrypt)
auto decrypt = [] (const std::string &ciphertext, const crypto::secret_key &skey, bool authenticated) -> string
{
- const size_t prefix_size = sizeof(chacha8_iv) + (authenticated ? sizeof(crypto::signature) : 0);
+ const size_t prefix_size = sizeof(chacha_iv) + (authenticated ? sizeof(crypto::signature) : 0);
if(ciphertext.size() < prefix_size)
return {};
- crypto::chacha8_key key;
- crypto::generate_chacha8_key(&skey, sizeof(skey), key);
- const crypto::chacha8_iv &iv = *(const crypto::chacha8_iv*)&ciphertext[0];
+ crypto::chacha_key key;
+ crypto::generate_chacha_key(&skey, sizeof(skey), key);
+ const crypto::chacha_iv &iv = *(const crypto::chacha_iv*)&ciphertext[0];
std::string plaintext;
plaintext.resize(ciphertext.size() - prefix_size);
if (authenticated)