Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 20:53:01 +01:00
Code Issues Projects Releases Wiki Activity

improve behaviour of misused encryption options

Browse Source
This commit is contained in:
Jfreegman 2014-09-19 00:29:30 -04:00
parent 919d36369c
commit daf4614ba6
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/toxic.c
View File

@ -568,6 +568,7 @@ static void first_time_encrypt(const char *msg)
valid_password = true; valid_password = true;
} }
queue_init_message("Data file '%s' has been encrypted", DATA_FILE);
memset(passconfirm, 0, sizeof(passconfirm)); memset(passconfirm, 0, sizeof(passconfirm));
user_password.data_is_encrypted = true; user_password.data_is_encrypted = true;
} }
@ -650,8 +651,6 @@ static void load_data(Tox *m, char *path)
/* attempt to encrypt an already encrypted data file */ /* attempt to encrypt an already encrypted data file */
if (arg_opts.encrypt_data && is_encrypted) if (arg_opts.encrypt_data && is_encrypted)
exit_toxic_err("failed in load_data", FATALERR_ENCRYPT); exit_toxic_err("failed in load_data", FATALERR_ENCRYPT);
else if (arg_opts.encrypt_data)
queue_init_message("Data file '%s' has been encrypted", path);
if (arg_opts.unencrypt_data && is_encrypted) if (arg_opts.unencrypt_data && is_encrypted)
queue_init_message("Data file '%s' has been unencrypted", path); queue_init_message("Data file '%s' has been unencrypted", path);
@ -967,8 +966,11 @@ int main(int argc, char *argv[])
init_signal_catchers(); init_signal_catchers();
parse_args(argc, argv); parse_args(argc, argv);
if (arg_opts.encrypt_data && arg_opts.unencrypt_data) if (arg_opts.encrypt_data && arg_opts.unencrypt_data) {
exit_toxic_err("failed in main", FATALERR_ENCRYPT); arg_opts.encrypt_data = 0;
arg_opts.unencrypt_data = 0;
queue_init_message("Warning: Using --unencrypt-data and --encrypt-data simultaneously has no effect");
}
/* Use the -b flag to enable stderr */ /* Use the -b flag to enable stderr */
if (!arg_opts.debug) if (!arg_opts.debug)
@ -1003,9 +1005,10 @@ int main(int argc, char *argv[])
if (!arg_opts.ignore_data_file) { if (!arg_opts.ignore_data_file) {
if (arg_opts.encrypt_data && !datafile_exists) if (arg_opts.encrypt_data && !datafile_exists)
exit_toxic_err("failed in main", FATALERR_ENCRYPT); arg_opts.encrypt_data = 0;
load_data(m, DATA_FILE); load_data(m, DATA_FILE);
} }
init_term(); init_term();