Commit 84d6fbb0 authored by Mark Haines's avatar Mark Haines
Browse files

Add some tests which advance the ratchet on both sides a few times

parent 0083a073
......@@ -157,7 +157,113 @@ assert_equals(std::size_t(-1), ::axolotl_decrypt(
plaintext_2, sizeof(plaintext_2)
));
}
{ /** More messages test */
TestCase test_case("More messages test");
MockRandom mock_random_a('A', 0x00);
MockRandom mock_random_b('B', 0x80);
std::uint8_t a_account_buffer[::axolotl_account_size()];
::AxolotlAccount *a_account = ::axolotl_account(a_account_buffer);
std::uint8_t a_random[::axolotl_create_account_random_length(a_account)];
mock_random_a(a_random, sizeof(a_random));
::axolotl_create_account(a_account, a_random, sizeof(a_random));
std::uint8_t b_account_buffer[::axolotl_account_size()];
::AxolotlAccount *b_account = ::axolotl_account(b_account_buffer);
std::uint8_t b_random[::axolotl_create_account_random_length(b_account)];
mock_random_b(b_random, sizeof(b_random));
::axolotl_create_account(b_account, b_random, sizeof(b_random));
std::uint8_t b_id_keys[::axolotl_account_identity_keys_length(b_account)];
std::uint8_t b_ot_keys[::axolotl_account_one_time_keys_length(b_account)];
::axolotl_account_identity_keys(b_account, b_id_keys, sizeof(b_id_keys));
::axolotl_account_one_time_keys(b_account, b_ot_keys, sizeof(b_ot_keys));
std::uint8_t a_session_buffer[::axolotl_session_size()];
::AxolotlSession *a_session = ::axolotl_session(a_session_buffer);
std::uint8_t a_rand[::axolotl_create_outbound_session_random_length(a_session)];
mock_random_a(a_rand, sizeof(a_rand));
assert_not_equals(std::size_t(-1), ::axolotl_create_outbound_session(
a_session, a_account,
b_id_keys + 14, 43,
::atol((char *)(b_ot_keys + 62)), b_ot_keys + 74, 43,
a_rand, sizeof(a_rand)
));
std::uint8_t plaintext[] = "Hello, World";
std::uint8_t message_1[::axolotl_encrypt_message_length(a_session, 12)];
std::uint8_t a_message_random[::axolotl_encrypt_random_length(a_session)];
mock_random_a(a_message_random, sizeof(a_message_random));
assert_equals(std::size_t(0), ::axolotl_encrypt_message_type(a_session));
assert_not_equals(std::size_t(-1), ::axolotl_encrypt(
a_session,
plaintext, 12,
a_message_random, sizeof(a_message_random),
message_1, sizeof(message_1)
));
std::uint8_t tmp_message_1[sizeof(message_1)];
std::memcpy(tmp_message_1, message_1, sizeof(message_1));
std::uint8_t b_session_buffer[::axolotl_account_size()];
::AxolotlSession *b_session = ::axolotl_session(b_session_buffer);
::axolotl_create_inbound_session(
b_session, b_account, tmp_message_1, sizeof(message_1)
);
std::memcpy(tmp_message_1, message_1, sizeof(message_1));
std::uint8_t plaintext_1[::axolotl_decrypt_max_plaintext_length(
b_session, 0, tmp_message_1, sizeof(message_1)
)];
std::memcpy(tmp_message_1, message_1, sizeof(message_1));
assert_equals(std::size_t(12), ::axolotl_decrypt(
b_session, 0,
tmp_message_1, sizeof(message_1),
plaintext_1, sizeof(plaintext_1)
));
for (unsigned i = 0; i < 8; ++i) {
{
std::uint8_t msg_a[::axolotl_encrypt_message_length(a_session, 12)];
std::uint8_t rnd_a[::axolotl_encrypt_random_length(a_session)];
mock_random_a(rnd_a, sizeof(rnd_a));
std::size_t type_a = ::axolotl_encrypt_message_type(a_session);
assert_not_equals(std::size_t(-1), ::axolotl_encrypt(
a_session, plaintext, 12, rnd_a, sizeof(rnd_a), msg_a, sizeof(msg_a)
));
std::uint8_t tmp_a[sizeof(msg_a)];
std::memcpy(tmp_a, msg_a, sizeof(msg_a));
std::uint8_t out_a[::axolotl_decrypt_max_plaintext_length(
b_session, type_a, tmp_a, sizeof(tmp_a)
)];
std::memcpy(tmp_a, msg_a, sizeof(msg_a));
assert_equals(std::size_t(12), ::axolotl_decrypt(
b_session, type_a, msg_a, sizeof(msg_a), out_a, sizeof(out_a)
));
}
{
std::uint8_t msg_b[::axolotl_encrypt_message_length(b_session, 12)];
std::uint8_t rnd_b[::axolotl_encrypt_random_length(b_session)];
mock_random_b(rnd_b, sizeof(rnd_b));
std::size_t type_b = ::axolotl_encrypt_message_type(b_session);
assert_not_equals(std::size_t(-1), ::axolotl_encrypt(
b_session, plaintext, 12, rnd_b, sizeof(rnd_b), msg_b, sizeof(msg_b)
));
std::uint8_t tmp_b[sizeof(msg_b)];
std::memcpy(tmp_b, msg_b, sizeof(msg_b));
std::uint8_t out_b[::axolotl_decrypt_max_plaintext_length(
a_session, type_b, tmp_b, sizeof(tmp_b)
)];
std::memcpy(tmp_b, msg_b, sizeof(msg_b));
assert_equals(std::size_t(12), ::axolotl_decrypt(
a_session, type_b, msg_b, sizeof(msg_b), out_b, sizeof(out_b)
));
}
}
}
}
......@@ -33,8 +33,8 @@ axolotl::CipherAesSha256 cipher(
);
std::uint8_t random_bytes[] = "0123456789ABDEF0123456789ABCDEF";
axolotl::Curve25519KeyPair bob_key;
axolotl::generate_key(random_bytes, bob_key);
axolotl::Curve25519KeyPair alice_key;
axolotl::generate_key(random_bytes, alice_key);
std::uint8_t shared_secret[] = "A secret";
......@@ -44,8 +44,8 @@ TestCase test_case("Axolotl Send/Receive");
axolotl::Ratchet alice(kdf_info, cipher);
axolotl::Ratchet bob(kdf_info, cipher);
alice.initialise_as_bob(shared_secret, sizeof(shared_secret) - 1, bob_key);
bob.initialise_as_alice(shared_secret, sizeof(shared_secret) - 1, bob_key);
alice.initialise_as_alice(shared_secret, sizeof(shared_secret) - 1, alice_key);
bob.initialise_as_bob(shared_secret, sizeof(shared_secret) - 1, alice_key);
std::uint8_t plaintext[] = "Message";
std::size_t plaintext_length = sizeof(plaintext) - 1;
......@@ -53,23 +53,23 @@ std::size_t plaintext_length = sizeof(plaintext) - 1;
std::size_t message_length, random_length, output_length;
std::size_t encrypt_length, decrypt_length;
{
/* Bob sends Alice a message */
message_length = bob.encrypt_output_length(plaintext_length);
random_length = bob.encrypt_random_length();
/* Alice sends Bob a message */
message_length = alice.encrypt_output_length(plaintext_length);
random_length = alice.encrypt_random_length();
assert_equals(std::size_t(0), random_length);
std::uint8_t message[message_length];
encrypt_length = bob.encrypt(
encrypt_length = alice.encrypt(
plaintext, plaintext_length,
NULL, 0,
message, message_length
);
assert_equals(message_length, encrypt_length);
output_length = alice.decrypt_max_plaintext_length(message, message_length);
output_length = bob.decrypt_max_plaintext_length(message, message_length);
std::uint8_t output[output_length];
decrypt_length = alice.decrypt(
decrypt_length = bob.decrypt(
message, message_length,
output, output_length
);
......@@ -79,24 +79,24 @@ std::size_t encrypt_length, decrypt_length;
{
/* Alice sends Bob a message */
message_length = alice.encrypt_output_length(plaintext_length);
random_length = alice.encrypt_random_length();
/* Bob sends Alice a message */
message_length = bob.encrypt_output_length(plaintext_length);
random_length = bob.encrypt_random_length();
assert_equals(std::size_t(32), random_length);
std::uint8_t message[message_length];
std::uint8_t random[] = "This is a random 32 byte string.";
encrypt_length = alice.encrypt(
encrypt_length = bob.encrypt(
plaintext, plaintext_length,
random, 32,
message, message_length
);
assert_equals(message_length, encrypt_length);
output_length = bob.decrypt_max_plaintext_length(message, message_length);
output_length = alice.decrypt_max_plaintext_length(message, message_length);
std::uint8_t output[output_length];
decrypt_length = bob.decrypt(
decrypt_length = alice.decrypt(
message, message_length,
output, output_length
);
......@@ -113,8 +113,8 @@ TestCase test_case("Axolotl Out of Order");
axolotl::Ratchet alice(kdf_info, cipher);
axolotl::Ratchet bob(kdf_info, cipher);
alice.initialise_as_bob(shared_secret, sizeof(shared_secret) - 1, bob_key);
bob.initialise_as_alice(shared_secret, sizeof(shared_secret) - 1, bob_key);
alice.initialise_as_alice(shared_secret, sizeof(shared_secret) - 1, alice_key);
bob.initialise_as_bob(shared_secret, sizeof(shared_secret) - 1, alice_key);
std::uint8_t plaintext_1[] = "First Message";
std::size_t plaintext_1_length = sizeof(plaintext_1) - 1;
......@@ -129,7 +129,7 @@ std::size_t encrypt_length, decrypt_length;
/* Alice sends Bob two messages and they arrive out of order */
message_1_length = alice.encrypt_output_length(plaintext_1_length);
random_length = alice.encrypt_random_length();
assert_equals(std::size_t(32), random_length);
assert_equals(std::size_t(0), random_length);
std::uint8_t message_1[message_1_length];
std::uint8_t random[] = "This is a random 32 byte string.";
......@@ -178,5 +178,45 @@ std::size_t encrypt_length, decrypt_length;
} /* Out of order test case */
{ /* More messages */
TestCase test_case("Axolotl More Messages");
axolotl::Ratchet alice(kdf_info, cipher);
axolotl::Ratchet bob(kdf_info, cipher);
alice.initialise_as_alice(shared_secret, sizeof(shared_secret) - 1, alice_key);
bob.initialise_as_bob(shared_secret, sizeof(shared_secret) - 1, alice_key);
std::uint8_t plaintext[] = "These 15 bytes";
assert_equals(std::size_t(15), sizeof(plaintext));
std::uint8_t random[] = "This is a random 32 byte string";
for (unsigned i = 0; i < 8; ++i) {
{
std::uint8_t msg[alice.encrypt_output_length(sizeof(plaintext))];
std::uint8_t encrypt_length = alice.encrypt(
plaintext, 15, random, 32, msg, sizeof(msg)
);
std::uint8_t output[bob.decrypt_max_plaintext_length(msg, sizeof(msg))];
assert_equals(
std::size_t(15), bob.decrypt(msg, sizeof(msg), output, sizeof(output))
);
}
random[31]++;
{
std::uint8_t msg[bob.encrypt_output_length(sizeof(plaintext))];
std::uint8_t encrypt_length = bob.encrypt(
plaintext, 15, random, 32, msg, sizeof(msg)
);
std::uint8_t output[alice.decrypt_max_plaintext_length(msg, sizeof(msg))];
assert_equals(
std::size_t(15), alice.decrypt(msg, sizeof(msg), output, sizeof(output))
);
}
random[31]++;
}
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment