diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-25 22:00:44 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-25 22:00:44 +0200 |
| commit | ca8c7e863f418de5a8bf7dc4327099ea1bd00245 (patch) | |
| tree | 3e2f7983fd7b7ab691113925db8d624a536f000e /src/serialization | |
| parent | 0a5bfa7c732935f24a5d81b04056129a3775bb14 (diff) | |
| parent | 5ad312a1c3c0491444338758119f332030b8fa2c (diff) | |
| download | monzero-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 'src/serialization')
| -rw-r--r-- | src/serialization/crypto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialization/crypto.h b/src/serialization/crypto.h index 4213f2e58..8083bdeb1 100644 --- a/src/serialization/crypto.h +++ b/src/serialization/crypto.h @@ -34,7 +34,7 @@ #include "serialization.h" #include "debug_archive.h" -#include "crypto/chacha8.h" +#include "crypto/chacha.h" #include "crypto/crypto.h" #include "crypto/hash.h" @@ -77,7 +77,7 @@ bool do_serialize(Archive<true> &ar, std::vector<crypto::signature> &v) return true; } -BLOB_SERIALIZER(crypto::chacha8_iv); +BLOB_SERIALIZER(crypto::chacha_iv); BLOB_SERIALIZER(crypto::hash); BLOB_SERIALIZER(crypto::hash8); BLOB_SERIALIZER(crypto::public_key); |