tLoad data into Tox_Option structure - ratox - FIFO based tox client
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 92a1fc5853d2c78400ccb02c6c09bc42f6732a04
(DIR) parent 4c121a138ebe4ac6283994bf9744f757c92e16d0
(HTM) Author: z3bra <contactatz3bradotorg>
Date: Mon, 31 Oct 2016 23:59:08 +0100
Load data into Tox_Option structure
Diffstat:
M ratox.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
---
(DIR) diff --git a/ratox.c b/ratox.c
t@@ -1006,6 +1006,8 @@ dataload(void)
fd = open(savefile, O_RDONLY);
if (fd < 0) {
+ toxopt.savedata_length = 0;
+ toxopt.savedata_data = NULL;
if (encryptsavefile) {
reprompt1:
while (readpass("Data : New passphrase > ", &passphrase, &pplen) < 0);
t@@ -1035,13 +1037,18 @@ reprompt1:
if (read(fd, data, sz) != sz)
eprintf("read %s:", savefile);
- if (tox_is_save_encrypted(data)) {
+ toxopt.savedata_length = sz;
+ toxopt.savedata_data = malloc(sz);
+ if (toxopt.savedata_data)
+ eprintf("malloc:");
+
+ if (tox_is_data_encrypted(data)) {
if (!encryptsavefile)
logmsg("Data : %s > Encrypted, but saving unencrypted\n", savefile);
while (readpass("Data : Passphrase > ", &passphrase, &pplen) < 0 ||
- tox_encrypted_load(tox, data, sz, passphrase, pplen) < 0);
+ !tox_pass_decrypt(data, sz, passphrase, pplen, toxopt.savedata_data));
} else {
- if (tox_load(tox, data, sz) < 0)
+ if (memcpy(toxopt.savedata_data, data, sz) < sz)
eprintf("Data : %s > Failed to load\n", savefile);
if (encryptsavefile) {
logmsg("Data : %s > Not encrypted, but saving encrypted\n", savefile);