From 667e415c74570cd1feb19ebfe259ab196f09bdc9 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 7 Jul 2015 08:56:18 +0100 Subject: Removed SignedKey class --- include/olm/account.hh | 5 ----- src/account.cpp | 28 ---------------------------- 2 files changed, 33 deletions(-) diff --git a/include/olm/account.hh b/include/olm/account.hh index 8094a25..2d1c17c 100644 --- a/include/olm/account.hh +++ b/include/olm/account.hh @@ -30,11 +30,6 @@ struct LocalKey { }; -struct SignedKey : LocalKey { - std::uint8_t signature[64]; -}; - - static std::size_t const MAX_ONE_TIME_KEYS = 100; struct Account { diff --git a/src/account.cpp b/src/account.cpp index 45e4b6d..5fa3873 100644 --- a/src/account.cpp +++ b/src/account.cpp @@ -102,34 +102,6 @@ static std::uint8_t const * unpickle( return pos; } - -static std::size_t pickle_length( - olm::SignedKey const & value -) { - return olm::pickle_length((olm::LocalKey const &) value) + 64; -} - - -static std::uint8_t * pickle( - std::uint8_t * pos, - olm::SignedKey const & value -) { - pos = olm::pickle(pos, (olm::LocalKey const &) value); - pos = olm::pickle_bytes(pos, value.signature, 64); - return pos; -} - - -static std::uint8_t const * unpickle( - std::uint8_t const * pos, std::uint8_t const * end, - olm::SignedKey & value -) { - pos = olm::unpickle(pos, end, (olm::LocalKey &) value); - pos = olm::unpickle_bytes(pos, end, value.signature, 64); - return pos; -} - - } // namespace olm -- cgit v1.2.3