Move utils for pickling into a separate file

4 files changed, 213 insertions, 28 deletions

diff --git a/include/axolotl/account.hh b/include/axolotl/account.hh
index dd9c819..0e65a7e 100644
--- a/include/axolotl/account.hh
+++ b/include/axolotl/account.hh
@@ -41,22 +41,24 @@ struct Account {
     LocalKey const * lookup_key(
         std::uint32_t id
     );
+};
 
-    /** The number of bytes needed to persist this account. */
-    std::size_t pickle_length();
 
-    /** Persists an account as a sequence of bytes
-     * Returns the number of output bytes used. */
-    std::size_t pickle(
-        std::uint8_t * output, std::size_t output_length
-    );
+std::size_t pickle_length(
+    Account const & value
+);
 
-    /** Loads an account from a sequence of bytes.
-     * Returns 0 on success, or std::size_t(-1) on failure. */
-    std::size_t unpickle(
-        std::uint8_t * input, std::size_t input_length
-    );
-};
+
+std::uint8_t * pickle(
+    std::uint8_t * pos,
+    Account const & value
+);
+
+
+std::uint8_t const * unpickle(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    Account & value
+);
 
 
 } // namespace axolotl
diff --git a/include/axolotl/pickle.hh b/include/axolotl/pickle.hh
new file mode 100644
index 0000000..a2de4f0
--- /dev/null
+++ b/include/axolotl/pickle.hh
@@ -0,0 +1,164 @@
+#ifndef AXOLOTL_PICKLE_HH_
+#define AXOLOTL_PICKLE_HH_
+
+#include "axolotl/list.hh"
+#include "axolotl/crypto.hh"
+
+#include <cstring>
+#include <cstdint>
+
+namespace axolotl {
+
+static std::size_t pickle_length(
+    const std::uint32_t & value
+) {
+    return 4;
+}
+
+
+static std::uint8_t * pickle(
+    std::uint8_t * pos,
+    std::uint32_t value
+) {
+    pos += 4;
+    for (unsigned i = 4; i--;) { *(--pos) = value; value >>= 8; }
+    return pos + 4;
+}
+
+
+static std::uint8_t const * unpickle(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    std::uint32_t & value
+) {
+    value = 0;
+    if (end - pos < 4) return end;
+    for (unsigned i = 4; i--;) { value <<= 8; value |= *(pos++); }
+    return pos;
+}
+
+static std::size_t pickle_length(
+    const bool & value
+) {
+    return 1;
+}
+
+
+static std::uint8_t * pickle(
+    std::uint8_t * pos,
+    bool value
+) {
+    *(pos++) = value ? 1 : 0;
+    return pos;
+}
+
+
+static std::uint8_t const * unpickle(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    bool & value
+) {
+    if (pos == end) return end;
+    value = *(pos++);
+    return pos;
+}
+
+
+
+template<typename T, std::size_t max_size>
+std::size_t pickle_length(
+    axolotl::List<T, max_size> const & list
+) {
+    std::size_t length = pickle_length(std::uint32_t(list.size()));
+    for (auto const & value : list) {
+        length += pickle_length(value);
+    }
+    return length;
+}
+
+
+template<typename T, std::size_t max_size>
+std::uint8_t * pickle(
+    std::uint8_t * pos,
+    axolotl::List<T, max_size> const & list
+) {
+    pos = pickle(pos, std::uint32_t(list.size()));
+    for (auto const & value : list) {
+        pos = pickle(pos, value);
+    }
+    return pos;
+}
+
+
+template<typename T, std::size_t max_size>
+std::uint8_t const * unpickle(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    axolotl::List<T, max_size> & list
+) {
+    std::uint32_t size;
+    pos = unpickle(pos, end, size);
+    while (size--) {
+        T * value = list.insert(list.end());
+        pos = unpickle(pos, end, *value);
+    }
+    return pos;
+}
+
+
+static std::uint8_t * pickle_bytes(
+    std::uint8_t * pos,
+    std::uint8_t const * bytes, std::size_t bytes_length
+) {
+    std::memcpy(pos, bytes, bytes_length);
+    return pos + bytes_length;
+}
+
+
+static std::uint8_t const * unpickle_bytes(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    std::uint8_t * bytes, std::size_t bytes_length
+) {
+    if (end - pos < bytes_length) return end;
+    std::memcpy(bytes, pos, bytes_length);
+    return pos + bytes_length;
+}
+
+
+std::size_t pickle_length(
+    const Curve25519PublicKey & value
+);
+
+
+std::uint8_t * pickle(
+    std::uint8_t * pos,
+    const Curve25519PublicKey & value
+);
+
+
+std::uint8_t const * unpickle(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    Curve25519PublicKey & value
+);
+
+
+std::size_t pickle_length(
+    const Curve25519KeyPair & value
+);
+
+
+std::uint8_t * pickle(
+    std::uint8_t * pos,
+    const Curve25519KeyPair & value
+);
+
+
+std::uint8_t const * unpickle(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    Curve25519KeyPair & value
+);
+
+
+} // namespace axolotl
+
+
+
+
+#endif /* AXOLOTL_PICKLE_HH */
diff --git a/include/axolotl/ratchet.hh b/include/axolotl/ratchet.hh
index eaf1352..0874cf0 100644
--- a/include/axolotl/ratchet.hh
+++ b/include/axolotl/ratchet.hh
@@ -114,21 +114,6 @@ struct Ratchet {
         Curve25519KeyPair const & our_ratchet_key
     );
 
-    /** The number of bytes needed to persist the current session. */
-    std::size_t pickle_length();
-
-    /** Persists a session as a sequence of bytes
-     * Returns the number of output bytes used. */
-    std::size_t pickle(
-        std::uint8_t * output, std::size_t output_length
-    );
-
-    /** Loads a session from a sequence of bytes.
-     * Returns 0 on success, or std::size_t(-1) on failure. */
-    std::size_t unpickle(
-        std::uint8_t * input, std::size_t input_length
-    );
-
     /** The number of bytes of output the encrypt method will write for
      * a given message length. */
     std::size_t encrypt_output_length(
@@ -172,4 +157,21 @@ struct Ratchet {
 };
 
 
+std::size_t pickle_length(
+    Ratchet const & value
+);
+
+
+std::uint8_t * pickle(
+    std::uint8_t * pos,
+    Ratchet const & value
+);
+
+
+std::uint8_t const * unpickle(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    Ratchet & value
+);
+
+
 } // namespace axolotl
diff --git a/include/axolotl/session.hh b/include/axolotl/session.hh
index 1c3395a..93c0b64 100644
--- a/include/axolotl/session.hh
+++ b/include/axolotl/session.hh
@@ -78,6 +78,23 @@ struct Session {
 };
 
 
+std::size_t pickle_length(
+    Session const & value
+);
+
+
+std::uint8_t * pickle(
+    std::uint8_t * pos,
+    Session const & value
+);
+
+
+std::uint8_t const * unpickle(
+    std::uint8_t const * pos, std::uint8_t const * end,
+    Session & value
+);
+
+
 } // namespace axolotl
 
 #endif /* AXOLOTL_SESSION_HH_ */