2 files changed, 53 insertions, 0 deletions

diff --git a/auto_tests/crypto_test.c b/auto_tests/crypto_test.c
index 806ea7b8..95cdefcd 100644
--- a/auto_tests/crypto_test.c
+++ b/auto_tests/crypto_test.c
@@ -246,6 +246,36 @@ START_TEST(test_large_data)
 }
 END_TEST
 
+START_TEST(test_large_data_symmetric)
+{
+    unsigned char k[crypto_secretbox_KEYBYTES];
+
+    unsigned char n[crypto_secretbox_NONCEBYTES];
+
+    unsigned char m1[16 * 16 * 16];
+    unsigned char c1[sizeof(m1) + crypto_box_MACBYTES];
+    unsigned char m1prime[sizeof(m1)];
+
+    int c1len;
+    int m1plen;
+
+    //Generate random messages
+    rand_bytes(m1, sizeof(m1));
+    rand_bytes(n, crypto_box_NONCEBYTES);
+
+    //Generate key
+    new_symmetric_key(k);
+
+    c1len = encrypt_data_symmetric(k, n, m1, sizeof(m1), c1);
+    ck_assert_msg(c1len == sizeof(m1) + crypto_box_MACBYTES, "could not encrypt data");
+
+    m1plen = decrypt_data_symmetric(k, n, c1, c1len, m1prime);
+
+    ck_assert_msg(m1plen == sizeof(m1), "decrypted text lengths differ");
+    ck_assert_msg(memcmp(m1prime, m1, sizeof(m1)) == 0, "decrypted texts differ");
+}
+END_TEST
+
 #define DEFTESTCASE(NAME) \
     TCase *NAME = tcase_create(#NAME); \
     tcase_add_test(NAME, test_##NAME); \
@@ -263,6 +293,7 @@ Suite *crypto_suite(void)
     DEFTESTCASE(fast_known);
     DEFTESTCASE_SLOW(endtoend, 15); /* waiting up to 15 seconds */
     DEFTESTCASE(large_data);
+    DEFTESTCASE(large_data_symmetric);
 
     return s;
 }
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index cfbc4967..5c8e242e 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -310,6 +310,27 @@ START_TEST(test_messenger_state_saveloadsave)
 }
 END_TEST
 
+START_TEST(test_messenger_state_saveload_encrypted)
+{
+    uint8_t addr[FRIEND_ADDRESS_SIZE];
+    getaddress(m, addr);
+    Messenger *m_temp = new_messenger(TOX_ENABLE_IPV6_DEFAULT);
+
+    size_t size = messenger_size_encrypted(m);
+    uint8_t buffer[size];
+    messenger_save_encrypted(m, buffer, "Gentoo", sizeof("Gentoo"));
+
+    ck_assert_msg(messenger_load_encrypted(m_temp, buffer, size, "Ubuntu", sizeof("Ubuntu")) == -1,
+                  "Bad password didn't make the function fail.");
+    ck_assert_msg(messenger_load_encrypted(m_temp, buffer, size, "Gentoo", sizeof("Gentoo")) == 0,
+                  "Good password didn't make the function succeed.");
+    uint8_t addr1[FRIEND_ADDRESS_SIZE];
+    getaddress(m_temp, addr1);
+    ck_assert_msg(memcmp(addr1, addr, FRIEND_ADDRESS_SIZE) == 0, "Didn't load messenger successfully");
+    kill_messenger(m_temp);
+}
+END_TEST
+
 #define DEFTESTCASE(NAME) \
     TCase *tc_##NAME = tcase_create(#NAME); \
     tcase_add_test(tc_##NAME, test_##NAME); \
@@ -321,6 +342,7 @@ Suite *messenger_suite(void)
 
     DEFTESTCASE(dht_state_saveloadsave);
     DEFTESTCASE(messenger_state_saveloadsave);
+    DEFTESTCASE(messenger_state_saveload_encrypted);
 
     DEFTESTCASE(getself_name);
     DEFTESTCASE(m_get_userstatus_size);