diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-04 12:08:26 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-04 12:08:26 +0200 |
| commit | 35e0bf2e06e4281efbebad3d8fbe8b1cf821c9d3 (patch) | |
| tree | 67b05328e4117d1ca1a7b7d2fcde7b91ffece761 | |
| parent | Merge pull request #5120 (diff) | |
| parent | ringct: fix v1 ecdhInfo serialization (diff) | |
| download | monero-35e0bf2e06e4281efbebad3d8fbe8b1cf821c9d3.tar.xz | |
Merge pull request #5122
52964501 ringct: fix v1 ecdhInfo serialization (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_basic/cryptonote_boost_serialization.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/cryptonote_basic/cryptonote_boost_serialization.h b/src/cryptonote_basic/cryptonote_boost_serialization.h index a4228b849..d1e321994 100644 --- a/src/cryptonote_basic/cryptonote_boost_serialization.h +++ b/src/cryptonote_basic/cryptonote_boost_serialization.h @@ -45,8 +45,6 @@ #include "ringct/rctTypes.h" #include "ringct/rctOps.h" -BOOST_CLASS_VERSION(rct::ecdhTuple, 1) - //namespace cryptonote { namespace boost { @@ -249,19 +247,8 @@ namespace boost template <class Archive> inline void serialize(Archive &a, rct::ecdhTuple &x, const boost::serialization::version_type ver) { - if (ver < 1) - { - a & x.mask; - a & x.amount; - return; - } - crypto::hash8 &amount = (crypto::hash8&)x.amount; - if (!Archive::is_saving::value) - { - memset(&x.mask, 0, sizeof(x.mask)); - memset(&x.amount, 0, sizeof(x.amount)); - } - a & amount; + a & x.mask; + a & x.amount; } template <class Archive> |