From a59fbdfe7fefcca1baefdbfda379d5dc9383210b Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Tue, 14 Jul 2015 11:32:11 +0100
Subject: Add a test for pickling and unpickling sessions, fix off by one error
 when unpickling sessions

---
 tests/test_olm.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

(limited to 'tests/test_olm.cpp')

diff --git a/tests/test_olm.cpp b/tests/test_olm.cpp
index ccd023f..551b3cd 100644
--- a/tests/test_olm.cpp
+++ b/tests/test_olm.cpp
@@ -55,7 +55,9 @@ std::memcpy(pickle2, pickle1, pickle_length);
 
 std::uint8_t account_buffer2[::olm_account_size()];
 ::OlmAccount *account2 = ::olm_account(account_buffer2);
-::olm_unpickle_account(account2, "secret_key", 10, pickle2, pickle_length);
+assert_not_equals(std::size_t(-1), ::olm_unpickle_account(
+    account2, "secret_key", 10, pickle2, pickle_length
+));
 assert_equals(pickle_length, ::olm_pickle_account_length(account2));
 ::olm_pickle_account(account2, "secret_key", 10, pickle2, pickle_length);
 
@@ -63,6 +65,52 @@ assert_equals(pickle1, pickle2, pickle_length);
 
 }
 
+{ /** Pickle session test */
+
+TestCase test_case("Pickle session test");
+MockRandom mock_random('P');
+
+std::uint8_t account_buffer[::olm_account_size()];
+::OlmAccount *account = ::olm_account(account_buffer);
+std::uint8_t random[::olm_create_account_random_length(account)];
+mock_random(random, sizeof(random));
+::olm_create_account(account, random, sizeof(random));
+
+std::uint8_t session_buffer[::olm_session_size()];
+::OlmSession *session = ::olm_session(session_buffer);
+std::uint8_t identity_key[32];
+std::uint8_t one_time_key[32];
+mock_random(identity_key, sizeof(identity_key));
+mock_random(one_time_key, sizeof(one_time_key));
+std::uint8_t random2[::olm_create_outbound_session_random_length(session)];
+mock_random(random2, sizeof(random2));
+
+::olm_create_outbound_session(
+    session, account,
+    identity_key, sizeof(identity_key),
+    one_time_key, sizeof(one_time_key),
+    random2, sizeof(random2)
+);
+
+
+std::size_t pickle_length = ::olm_pickle_session_length(session);
+std::uint8_t pickle1[pickle_length];
+::olm_pickle_session(session, "secret_key", 10, pickle1, pickle_length);
+std::uint8_t pickle2[pickle_length];
+std::memcpy(pickle2, pickle1, pickle_length);
+
+std::uint8_t session_buffer2[::olm_session_size()];
+::OlmSession *session2 = ::olm_session(session_buffer2);
+assert_not_equals(std::size_t(-1), ::olm_unpickle_session(
+    session2, "secret_key", 10, pickle2, pickle_length
+));
+assert_equals(pickle_length, ::olm_pickle_session_length(session2));
+::olm_pickle_session(session2, "secret_key", 10, pickle2, pickle_length);
+
+assert_equals(pickle1, pickle2, pickle_length);
+
+}
+
 { /** Loopback test */
 
 TestCase test_case("Loopback test");
-- 
cgit v1.2.3