Fixed error in Session pickle() & unpickle() (#7)

Author: anunayk

javascript/test/olm.spec.js

@@ -107,5 +107,24 @@ describe("olm", function() {
         decrypted = aliceSession.decrypt(encrypted.type, encrypted.body);
         console.log(TEST_TEXT, "->", decrypted);
         expect(decrypted).toEqual(TEST_TEXT);
+
+        // Pickle and restore sessions
+        var alicePickleKey = 'SomeSecretAlice';
+        var bobPickleKey = 'SomeSecretBob';
+        var aliceSessionPickled = aliceSession.pickle(alicePickleKey);
+        var bobSessionPickled = bobSession.pickle(bobPickleKey);
+
+        aliceSession = new Olm.Session();
+        bobSession = new Olm.Session();
+
+        aliceSession.unpickle(alicePickleKey, aliceSessionPickled);
+        bobSession.unpickle(bobPickleKey, bobSessionPickled);
+
+        TEST_TEXT='some emoji: ☕ 123 // after pickling';
+        encrypted = bobSession.encrypt(TEST_TEXT);
+        expect(encrypted.type).toEqual(1);
+        decrypted = aliceSession.decrypt(encrypted.type, encrypted.body);
+        console.log(TEST_TEXT, "->", decrypted);
+        expect(decrypted).toEqual(TEST_TEXT);
     });
 });

src/session.cpp

@@ -508,6 +508,7 @@ std::size_t olm::pickle_length(
     length += olm::pickle_length(value.alice_identity_key);
     length += olm::pickle_length(value.alice_base_key);
     length += olm::pickle_length(value.bob_one_time_key);
+    length += olm::pickle_length(value.bob_prekey);
     length += olm::pickle_length(value.ratchet);
     return length;
 }
@@ -522,6 +523,7 @@ std::uint8_t * olm::pickle(
     pos = olm::pickle(pos, value.alice_identity_key);
     pos = olm::pickle(pos, value.alice_base_key);
     pos = olm::pickle(pos, value.bob_one_time_key);
+    pos = olm::pickle(pos, value.bob_prekey);
     pos = olm::pickle(pos, value.ratchet);
     return pos;
 }
@@ -553,6 +555,7 @@ std::uint8_t const * olm::unpickle(
     pos = olm::unpickle(pos, end, value.alice_identity_key); UNPICKLE_OK(pos);
     pos = olm::unpickle(pos, end, value.alice_base_key); UNPICKLE_OK(pos);
     pos = olm::unpickle(pos, end, value.bob_one_time_key); UNPICKLE_OK(pos);
+    pos = olm::unpickle(pos, end, value.bob_prekey); UNPICKLE_OK(pos);
     pos = olm::unpickle(pos, end, value.ratchet, includes_chain_index); UNPICKLE_OK(pos);
 
     return pos;

tests/test_olm.cpp

@@ -130,18 +130,25 @@ ::olm_create_account(account, random.data(), random.size());
 std::vector<std::uint8_t> session_buffer(::olm_session_size());
 ::OlmSession *session = ::olm_session(session_buffer.data());
 std::uint8_t identity_key[32];
+std::uint8_t identity_signing_key[32];
 std::uint8_t one_time_key[32];
 std::uint8_t pre_key[32];
 mock_random(identity_key, sizeof(identity_key));
+mock_random(identity_signing_key, sizeof(identity_key));
 mock_random(one_time_key, sizeof(one_time_key));
 mock_random(pre_key, sizeof(one_time_key));
 std::vector<std::uint8_t> random2(::olm_create_outbound_session_random_length(session));
 mock_random(random2.data(), random2.size());
+std::uint8_t pre_key_signature[86];
+olm_account_prekey_signature(account, pre_key_signature);
+// ::olm_account_sign(account, pre_key, sizeof(pre_key), pre_key_signature, olm_account_signature_length(account));
 
 ::olm_create_outbound_session(
     session, account,
     identity_key, sizeof(identity_key),
+    identity_signing_key, sizeof(identity_signing_key),
     pre_key, sizeof(pre_key),
+    pre_key_signature, sizeof(pre_key_signature),
     one_time_key, sizeof(one_time_key),
     random2.data(), random2.size()
 );
@@ -217,9 +224,11 @@ ::olm_account_identity_keys(a_account, a_id_keys.data(), a_id_keys.size());
 
 std::vector<std::uint8_t> b_id_keys(::olm_account_identity_keys_length(b_account));
 std::vector<std::uint8_t> b_pre_key(::olm_account_prekey_length(b_account));
+std::vector<std::uint8_t> b_pre_key_signature(::olm_account_signature_length(b_account));
 std::vector<std::uint8_t> b_ot_keys(::olm_account_one_time_keys_length(b_account));
 ::olm_account_identity_keys(b_account, b_id_keys.data(), b_id_keys.size());
 ::olm_account_prekey(b_account, b_pre_key.data(), b_pre_key.size());
+::olm_account_prekey_signature(b_account, b_pre_key_signature.data());
 ::olm_account_one_time_keys(b_account, b_ot_keys.data(), b_ot_keys.size());
 
 std::vector<std::uint8_t> a_session_buffer(::olm_session_size());
@@ -229,7 +238,9 @@ mock_random_a(a_rand.data(), a_rand.size());
 CHECK_NE(std::size_t(-1), ::olm_create_outbound_session(
     a_session, a_account,
     b_id_keys.data() + 15, 43, // B's curve25519 identity key
+    b_id_keys.data() + 71, 43, // B's ed25519 signing key
     b_pre_key.data() + 25, 43,  // B's curve25519 pre key
+    b_pre_key_signature.data(), 86, // B's ed25519 prekey signature
     b_ot_keys.data() + 25, 43, // B's curve25519 one time key
     a_rand.data(), a_rand.size()
 ));
@@ -369,9 +380,11 @@ ::olm_account_generate_prekey(b_account, p_random.data(), p_random.size());
 
 std::vector<std::uint8_t> b_id_keys(::olm_account_identity_keys_length(b_account));
 std::vector<std::uint8_t> b_pre_key(::olm_account_prekey_length(b_account));
+std::vector<std::uint8_t> b_pre_key_signature(::olm_account_signature_length(b_account));
 std::vector<std::uint8_t> b_ot_keys(::olm_account_one_time_keys_length(b_account));
 ::olm_account_identity_keys(b_account, b_id_keys.data(), b_id_keys.size());
 ::olm_account_prekey(b_account, b_pre_key.data(), b_pre_key.size());
+::olm_account_prekey_signature(b_account, b_pre_key_signature.data());
 ::olm_account_one_time_keys(b_account, b_ot_keys.data(), b_ot_keys.size());
 
 std::vector<std::uint8_t> a_session_buffer(::olm_session_size());
@@ -381,7 +394,9 @@ mock_random_a(a_rand.data(), a_rand.size());
 CHECK_NE(std::size_t(-1), ::olm_create_outbound_session(
     a_session, a_account,
     b_id_keys.data() + 15, 43,
+    b_id_keys.data() + 71, 43,
     b_pre_key.data() + 25, 43,
+    b_pre_key_signature.data(), 86,
     b_ot_keys.data() + 25, 43,
     a_rand.data(), a_rand.size()
 ));
@@ -492,9 +507,11 @@ mock_random_b(f_random.data(), f_random.size());
 ::olm_account_generate_fallback_key(b_account, f_random.data(), f_random.size());
 std::vector<std::uint8_t> b_fb_key(::olm_account_unpublished_fallback_key_length(b_account));
 std::vector<std::uint8_t> b_pre_key(::olm_account_prekey_length(b_account));
+std::vector<std::uint8_t> b_pre_key_signature(::olm_account_signature_length(b_account));
 
 ::olm_account_identity_keys(b_account, b_id_keys.data(), b_id_keys.size());
 ::olm_account_prekey(b_account, b_pre_key.data(), b_pre_key.size());
+::olm_account_prekey_signature(b_account, b_pre_key_signature.data());
 ::olm_account_unpublished_fallback_key(b_account, b_fb_key.data(), b_fb_key.size());
 
 // start a new olm session and encrypt a message
@@ -505,7 +522,9 @@ mock_random_a(a_rand.data(), a_rand.size());
 CHECK_NE(std::size_t(-1), ::olm_create_outbound_session(
     a_session1, a_account,
     b_id_keys.data() + 15, 43, // B's curve25519 identity key
+    b_id_keys.data() + 71, 43, // B's ed25519 identity key
     b_pre_key.data() + 25, 43, // B's curve25519 pre key
+    b_pre_key_signature.data(), 86, // B's ed25519 prekey signature
     b_fb_key.data() + 25, 43, // B's curve25519 one time key
     a_rand.data(), a_rand.size()
 ));
@@ -580,7 +599,9 @@ mock_random_a(a_rand.data(), a_rand.size());
 CHECK_NE(std::size_t(-1), ::olm_create_outbound_session(
     a_session2, a_account,
     b_id_keys.data() + 15, 43, // B's curve25519 identity key
+    b_id_keys.data() + 71, 43, // B's ed25519 identity key
     b_pre_key.data() + 25, 43, // B's curve25519 pre key
+    b_pre_key_signature.data(), 86, // B's ed25519 prekey signature
     b_fb_key.data() + 25, 43, // B's curve25519 one time key
     a_rand.data(), a_rand.size()
 ));
@@ -649,7 +670,9 @@ mock_random_a(a_rand.data(), a_rand.size());
 CHECK_NE(std::size_t(-1), ::olm_create_outbound_session(
     a_session3, a_account,
     b_id_keys.data() + 15, 43, // B's curve25519 identity key
+    b_id_keys.data() + 71, 43, // B's ed25519 identity key
     b_pre_key.data() + 25, 43, // B's curve25519 pre key
+    b_pre_key_signature.data(), 86, // B's ed25519 prekey signature
     b_fb_key.data() + 25, 43, // B's curve25519 one time key
     a_rand.data(), a_rand.size()
 ));

tests/test_olm_using_malloc.cpp

@@ -72,12 +72,15 @@ free(o_random);
 
 std::size_t b_id_keys_size = ::olm_account_identity_keys_length(b_account);
 std::size_t b_pre_key_size = ::olm_account_prekey_length(b_account);
+std::size_t b_pre_key_signature_size = ::olm_account_signature_length(b_account);
 std::size_t b_ot_keys_size = ::olm_account_one_time_keys_length(b_account);
 std::uint8_t * b_id_keys = (std::uint8_t *) check_malloc(b_id_keys_size);
 std::uint8_t * b_pre_key = (std::uint8_t *) check_malloc(b_pre_key_size);
+std::uint8_t * b_pre_key_signature = (std::uint8_t *) check_malloc(b_pre_key_signature_size);
 std::uint8_t * b_ot_keys = (std::uint8_t *) check_malloc(b_ot_keys_size);
 ::olm_account_identity_keys(b_account, b_id_keys, b_id_keys_size);
 ::olm_account_prekey(b_account, b_pre_key, b_pre_key_size);
+::olm_account_prekey_signature(b_account, b_pre_key_signature);
 ::olm_account_one_time_keys(b_account, b_ot_keys, b_ot_keys_size);
 
 void * a_session_buffer = check_malloc(::olm_session_size());
@@ -89,7 +92,9 @@ mock_random_a(a_rand, a_rand_size);
 CHECK_NE(std::size_t(-1), ::olm_create_outbound_session(
     a_session, a_account,
     b_id_keys + 15, 43,
+    b_id_keys + 71, 43,
     b_pre_key + 25, 43,
+    b_pre_key_signature, 86,
     b_ot_keys + 25, 43,
     a_rand, a_rand_size
 ));