diff options
author | Riccardo Spagni <ric@spagni.net> | 2015-08-10 20:02:36 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2015-08-10 20:02:38 +0200 |
commit | ef15e909f5f935e84d5e4c867b99a6bee59db63f (patch) | |
tree | 6199ee504482abac3b764c4018b614a8339c8de7 /src/serialization/crypto.h | |
parent | Merge pull request #359 (diff) | |
parent | encrypted payment ids are now 64 bit, instead of 256 bit (diff) | |
download | monero-ef15e909f5f935e84d5e4c867b99a6bee59db63f.tar.xz |
Merge pull request #361
a2d7a5f encrypted payment ids are now 64 bit, instead of 256 bit (moneromooo-monero)
e40cfc4 Encrypted payment IDs (moneromooo-monero)
Diffstat (limited to 'src/serialization/crypto.h')
-rw-r--r-- | src/serialization/crypto.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/serialization/crypto.h b/src/serialization/crypto.h index f18e85b12..575697c06 100644 --- a/src/serialization/crypto.h +++ b/src/serialization/crypto.h @@ -79,12 +79,14 @@ bool do_serialize(Archive<true> &ar, std::vector<crypto::signature> &v) BLOB_SERIALIZER(crypto::chacha8_iv); BLOB_SERIALIZER(crypto::hash); +BLOB_SERIALIZER(crypto::hash8); BLOB_SERIALIZER(crypto::public_key); BLOB_SERIALIZER(crypto::secret_key); BLOB_SERIALIZER(crypto::key_derivation); BLOB_SERIALIZER(crypto::key_image); BLOB_SERIALIZER(crypto::signature); VARIANT_TAG(debug_archive, crypto::hash, "hash"); +VARIANT_TAG(debug_archive, crypto::hash8, "hash8"); VARIANT_TAG(debug_archive, crypto::public_key, "public_key"); VARIANT_TAG(debug_archive, crypto::secret_key, "secret_key"); VARIANT_TAG(debug_archive, crypto::key_derivation, "key_derivation"); |