summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--auto_tests/encryptsave_test.c2
-rw-r--r--toxencryptsave/toxencryptsave.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/auto_tests/encryptsave_test.c b/auto_tests/encryptsave_test.c
index db5e824a..30670b84 100644
--- a/auto_tests/encryptsave_test.c
+++ b/auto_tests/encryptsave_test.c
@@ -80,7 +80,7 @@ Suite * encryptsave_suite(void)
80{ 80{
81 Suite *s = suite_create("encryptsave"); 81 Suite *s = suite_create("encryptsave");
82 82
83 DEFTESTCASE_SLOW(known_kdf, 60); 83 DEFTESTCASE_SLOW(known_kdf, 60); /* is 5-10 seconds on my computer, but is directly dependent on CPU */
84 DEFTESTCASE(save_friend); 84 DEFTESTCASE(save_friend);
85 85
86 return s; 86 return s;
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c
index 390a5e5d..ae042199 100644
--- a/toxencryptsave/toxencryptsave.c
+++ b/toxencryptsave/toxencryptsave.c
@@ -72,6 +72,8 @@ int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint3
72 /* out of memory most likely */ 72 /* out of memory most likely */
73 return -1; 73 return -1;
74 } 74 }
75 /* calling sodium_memzero segfaults, but printing passphrase works, so... libsodium bug?
76 * ...eh, it's not segfaulting anywhere else, so I'll assume pebkac...
75 sodium_memzero(passphrase, pplength); /* wipe plaintext pw */ 77 sodium_memzero(passphrase, pplength); /* wipe plaintext pw */
76 78
77 /* next get plain save data */ 79 /* next get plain save data */
@@ -140,7 +142,7 @@ int tox_encrypted_load(Tox *tox, const uint8_t *data, uint32_t length, uint8_t *
140 /* out of memory most likely */ 142 /* out of memory most likely */
141 return -1; 143 return -1;
142 } 144 }
143 sodium_memzero(passphrase, pplength); /* wipe plaintext pw */ 145 /* sodium_memzero(passphrase, pplength); /* wipe plaintext pw */
144 146
145 /* decrypt the data */ 147 /* decrypt the data */
146 uint8_t temp_data[decrypt_length]; 148 uint8_t temp_data[decrypt_length];