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

add confirmation when creating new password

Browse Source
This commit is contained in:
Jfreegman 2014-09-15 19:00:36 -04:00
parent 388d78d11e
commit 89f9c07b9e
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/toxic.c
View File

@ -513,11 +513,11 @@ static int password_prompt(char *buf, int size)
/* Ask user if they would like to encrypt the data file on first usage */ /* Ask user if they would like to encrypt the data file on first usage */
static void first_time_encrypt(const char *msg) static void first_time_encrypt(const char *msg)
{ {
char ch[5] = {0}; char ch[256] = {0};
do { do {
system("clear"); system("clear");
printf("%s\n", msg); printf("%s ", msg);
if (!strcasecmp(ch, "y\n") || !strcasecmp(ch, "n\n") if (!strcasecmp(ch, "y\n") || !strcasecmp(ch, "n\n")
|| !strcasecmp(ch, "yes\n") || !strcasecmp(ch, "no\n") || !strcasecmp(ch, "yes\n") || !strcasecmp(ch, "no\n")
@ -526,23 +526,46 @@ static void first_time_encrypt(const char *msg)
} while (fgets(ch, sizeof(ch), stdin)); } while (fgets(ch, sizeof(ch), stdin));
printf("\n");
if (ch[0] == 'q' || ch[0] == 'Q') if (ch[0] == 'q' || ch[0] == 'Q')
exit(0); exit(0);
if (ch[0] == 'y' || ch[0] == 'Y') { if (ch[0] == 'y' || ch[0] == 'Y') {
int len = 0; int len = 0;
printf("Enter a new password (must be at least %d characters)\n", MIN_PASSWORD_LEN); bool valid_password = false;
char passconfirm[MAX_PASSWORD_LEN + 1] = {0};
printf("Enter a new password (must be at least %d characters) ", MIN_PASSWORD_LEN);
while (true) { while (valid_password == false) {
len = password_prompt(user_password.pass, sizeof(user_password.pass)); len = password_prompt(user_password.pass, sizeof(user_password.pass));
user_password.len = len; user_password.len = len;
if (len >= MIN_PASSWORD_LEN && len <= MAX_PASSWORD_LEN) if (strcasecmp(user_password.pass, "q") == 0)
break; exit(0);
else
printf("Password must be between %d and %d characters long.\n", MIN_PASSWORD_LEN, MAX_PASSWORD_LEN); if (string_is_empty(passconfirm) && (len < MIN_PASSWORD_LEN || len > MAX_PASSWORD_LEN)) {
printf("Password must be between %d and %d characters long. ", MIN_PASSWORD_LEN, MAX_PASSWORD_LEN);
continue;
}
if (string_is_empty(passconfirm)) {
printf("Enter password again ");
snprintf(passconfirm, sizeof(passconfirm), "%s", user_password.pass);
continue;
}
if (strcmp(user_password.pass, passconfirm) != 0) {
memset(passconfirm, 0, sizeof(passconfirm));
memset(user_password.pass, 0, sizeof(user_password.pass));
printf("Passwords don't match. Try again. ");
continue;
}
valid_password = true;
} }
memset(passconfirm, 0, sizeof(passconfirm));
user_password.data_is_encrypted = true; user_password.data_is_encrypted = true;
queue_init_message("Data file has been encrypted"); queue_init_message("Data file has been encrypted");
} }
@ -639,8 +662,12 @@ static void load_data(Tox *m, char *path)
if (strcasecmp(user_password.pass, "q") == 0) if (strcasecmp(user_password.pass, "q") == 0)
exit(0); exit(0);
if (pwlen < MIN_PASSWORD_LEN) if (pwlen < MIN_PASSWORD_LEN) {
system("clear");
sleep(1);
printf("Invalid password. Try again. ");
continue; continue;
}
if (tox_encrypted_load(m, (uint8_t *) buf, len, (uint8_t *) user_password.pass, pwlen) == 0) { if (tox_encrypted_load(m, (uint8_t *) buf, len, (uint8_t *) user_password.pass, pwlen) == 0) {
break; break;