emdee/tox-weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

profile: fix data loading without encryption

Browse Source
This commit is contained in:
Håvard Pettersson 2018-04-12 23:25:41 +02:00
parent 3e3c598e0c
commit ed016091fc
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/twc-profile.c
View File

@ -361,6 +361,9 @@ twc_profile_load(struct t_twc_profile *profile)
fclose(file); fclose(file);
} }
options.savedata_data = data;
options.savedata_length = data_size;
#if TOXENCRYPTSAVE_ENABLED #if TOXENCRYPTSAVE_ENABLED
uint8_t dec_data[data_size]; uint8_t dec_data[data_size];
@ -382,19 +385,21 @@ twc_profile_load(struct t_twc_profile *profile)
weechat_prefix("error")); weechat_prefix("error"));
return TWC_RC_ERROR; return TWC_RC_ERROR;
} }
data_size -= TOX_PASS_ENCRYPTION_EXTRA_LENGTH; options.savedata_data = dec_data;
options.savedata_length -= TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
}
else
{
weechat_printf(profile->buffer,
"%scould not decrypt Tox data file (no passphrase "
"specified)", weechat_prefix("error"));
return TWC_RC_ERROR;
} }
options.savedata_data = dec_data;
}
else
{
options.savedata_data = data;
} }
#endif /* TOXENCRYPTSAVE_ENABLED */ #endif /* TOXENCRYPTSAVE_ENABLED */
options.savedata_type = options.savedata_type =
(data_size == 0) ? TOX_SAVEDATA_TYPE_NONE : TOX_SAVEDATA_TYPE_TOX_SAVE; (data_size == 0) ? TOX_SAVEDATA_TYPE_NONE : TOX_SAVEDATA_TYPE_TOX_SAVE;
options.savedata_length = data_size;
/* create Tox */ /* create Tox */
TOX_ERR_NEW rc; TOX_ERR_NEW rc;