Send the public part of the one time key rather than passing an identifier

1 files changed, 4 insertions, 4 deletions

diff --git a/include/olm/message.hh b/include/olm/message.hh
index fefdd20..5ce0a62 100644
--- a/include/olm/message.hh
+++ b/include/olm/message.hh
@@ -73,16 +73,16 @@ void decode_message(
 struct PreKeyMessageWriter {
     std::uint8_t * identity_key;
     std::uint8_t * base_key;
+    std::uint8_t * one_time_key;
     std::uint8_t * message;
 };
 
 
 struct PreKeyMessageReader {
     std::uint8_t version;
-    bool has_one_time_key_id;
-    std::uint32_t one_time_key_id;
     std::uint8_t const * identity_key; std::size_t identity_key_length;
     std::uint8_t const * base_key; std::size_t base_key_length;
+    std::uint8_t const * one_time_key; std::size_t one_time_key_length;
     std::uint8_t const * message; std::size_t message_length;
 };
 
@@ -91,9 +91,9 @@ struct PreKeyMessageReader {
  * The length of the buffer needed to hold a message.
  */
 std::size_t encode_one_time_key_message_length(
-    std::uint32_t one_time_key_id,
     std::size_t identity_key_length,
     std::size_t base_key_length,
+    std::size_t one_time_key_length,
     std::size_t message_length
 );
 
@@ -105,9 +105,9 @@ std::size_t encode_one_time_key_message_length(
 void encode_one_time_key_message(
     PreKeyMessageWriter & writer,
     std::uint8_t version,
-    std::uint32_t one_time_key_id,
     std::size_t identity_key_length,
     std::size_t base_key_length,
+    std::size_t one_time_key_length,
     std::size_t message_length,
     std::uint8_t * output
 );