done changing passwords on the fly
This commit is contained in:
1 parent
be92c14ee6
commit
c2ebaab825
6 files changed
+100
-67
No files matched your search
+61
-35
@@ -12,14 +12,15 @@ enum menu_options {
|
||||
SAVE_NEW_PASS,
|
||||
READING_PASS,
|
||||
READ_USER_CHOICE,
|
||||
SHOW_THIS_MENU
|
||||
SHOW_MAIN_MENU,
|
||||
WAIT_PASS_INDEX
|
||||
};
|
||||
|
||||
// clang-format on
|
||||
uint8_t readed_option[1] = {255};
|
||||
uint8_t readed_option[1] = {SHOW_MAIN_MENU};
|
||||
uint8_t count_readed = 0;
|
||||
uint8_t return_key = 0;
|
||||
uint8_t password_index = -1;
|
||||
uint8_t password_index = 255;
|
||||
uint8_t *enc_pass_new;
|
||||
|
||||
uint8_t *readed_key_new;
|
||||
@@ -30,7 +31,7 @@ uint8_t read_new_key(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case KC_ENTER:
|
||||
readed_option[0] = SAVE_NEW_PASS;
|
||||
return 1;
|
||||
return RED_KEY_READ;
|
||||
break;
|
||||
default:
|
||||
if (count_char_key_new + 1 == enc_pass.storage_pass_len) {
|
||||
@@ -41,7 +42,7 @@ uint8_t read_new_key(uint16_t keycode, keyrecord_t *record) {
|
||||
return kc_to_ascii(keycode, record, readed_key_new, &count_char_key_new);
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
return RED_IDLE;
|
||||
}
|
||||
|
||||
// clang-format on
|
||||
@@ -52,8 +53,8 @@ uint8_t read_new_key(uint16_t keycode, keyrecord_t *record) {
|
||||
uint8_t draw_red_menu(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (readed_option[0]) {
|
||||
case EXIT:
|
||||
readed_option[0] = 255;
|
||||
return 2;
|
||||
readed_option[0] = SHOW_MAIN_MENU;
|
||||
return RED_MENU_EXIT;
|
||||
break;
|
||||
case READ_USER_CHOICE: {
|
||||
return_key = kc_to_ascii(keycode, record, readed_option, &count_readed);
|
||||
@@ -79,52 +80,76 @@ uint8_t draw_red_menu(uint16_t keycode, keyrecord_t *record) {
|
||||
if (readed_option[0] == ASCII_LOW_6) {
|
||||
readed_option[0] = ADD_NEW_PASS;
|
||||
}
|
||||
if (return_key == 1) {
|
||||
send_string(SS_DOWN(X_LCTL) SS_DOWN(X_A) SS_UP(X_LCTL) SS_UP(X_A) SS_TAP(X_BACKSPACE));
|
||||
return 1;
|
||||
if (return_key == RED_KEY_READ) {
|
||||
readed_key_new = red_init_array(MAX_KEY_LEN, 0x00); // init or reinit readed keys
|
||||
count_char_key_new = 0; // init or reinit counted keys
|
||||
CLEAR_MENU_MACROS;
|
||||
return RED_KEY_READ;
|
||||
}
|
||||
readed_key_new = red_init_array(MAX_KEY_LEN, 0x00); // init or reinit readed keys
|
||||
count_char_key_new = 0; // init or reinit counted keys
|
||||
break;
|
||||
}
|
||||
case SHOW_PASS_NAMES:
|
||||
case SHOW_MEMORY_USAGE:
|
||||
case CHANGE_MASTER_KEY:
|
||||
case SHOW_PASS_NAMES: // TODO
|
||||
case SHOW_MEMORY_USAGE: // TODO
|
||||
case CHANGE_MASTER_KEY: // TODO
|
||||
case CHANGE_PASS_IN_STORAGE:
|
||||
send_string("Which one? [0-");
|
||||
send_byte(enc_pass.password_count);
|
||||
send_string("]: ");
|
||||
password_index = kc_to_ascii(keycode, record, readed_option, &count_readed);
|
||||
count_readed = 0;
|
||||
readed_option[0] = READING_PASS;
|
||||
send_string("\nWrite new password. Tap `Enter` for confirm\n");
|
||||
send_string("Which one? Write index in hex [0-9a-f]: "); // now you can change first 16 passwords on the fly
|
||||
// to read more, I need read keys as integers, or bytes
|
||||
readed_option[0] = WAIT_PASS_INDEX;
|
||||
// send_string("Which one? [1-");
|
||||
// send_byte(enc_pass.password_count);
|
||||
// send_string("]: ");
|
||||
break;
|
||||
case CHANGE_PASS_NAME:
|
||||
case WAIT_PASS_INDEX:
|
||||
return_key = kc_to_ascii(keycode, record, readed_option, &count_readed);
|
||||
count_readed = 0;
|
||||
uint8_t pass_ind_upd = 0; // for checking right translation from keycode to num
|
||||
if (return_key == RED_KEY_READ) {
|
||||
if (readed_option[0] >= ASCII_LOW_0 && readed_option[0] <= ASCII_LOW_9) {
|
||||
password_index = readed_option[0] - 0x30;
|
||||
pass_ind_upd++;
|
||||
} else if (readed_option[0] >= ASCII_LOW_A && readed_option[0] <= ASCII_LOW_F) {
|
||||
password_index = readed_option[0] - 0x61 + 10;
|
||||
pass_ind_upd++;
|
||||
}
|
||||
if (pass_ind_upd == 0 || password_index >= enc_pass.password_count) {
|
||||
send_string("\nWrong index! Try again!\n");
|
||||
readed_option[0] = CHANGE_PASS_IN_STORAGE;
|
||||
} else {
|
||||
readed_option[0] = READING_PASS;
|
||||
send_string("\nWrite new password. Tap `Enter` for confirm\n");
|
||||
}
|
||||
return RED_KEY_READ;
|
||||
}
|
||||
break;
|
||||
case CHANGE_PASS_NAME: // TODO
|
||||
case SAVE_NEW_PASS:
|
||||
enc_pass_new = (uint8_t *)malloc(sizeof(uint8_t) * enc_pass.storage_pass_len);
|
||||
enc_pass_new = encrypt_pass_kuzn(readed_key_new, count_char_key_new, password_index);
|
||||
if (password_index == -1) {
|
||||
enc_pass_new = (uint8_t *)malloc(sizeof(uint8_t) * enc_pass.storage_pass_len);
|
||||
enc_pass_new = encrypt_pass_kuzn(readed_key_new, count_char_key_new, password_index);
|
||||
count_char_key_new = 0;
|
||||
if (password_index == 255) {
|
||||
for (uint8_t new_pass_index = 0; new_pass_index < enc_pass.storage_pass_len; new_pass_index++) {
|
||||
enc_pass.passwords[enc_pass.password_count * enc_pass.storage_pass_len + new_pass_index] = enc_pass_new[new_pass_index];
|
||||
}
|
||||
enc_pass.password_count++;
|
||||
} else {
|
||||
for (uint8_t new_pass_index = password_index; new_pass_index < enc_pass.storage_pass_len; new_pass_index++) {
|
||||
enc_pass.passwords[enc_pass.password_count * enc_pass.storage_pass_len + new_pass_index] = enc_pass_new[new_pass_index];
|
||||
for (uint8_t new_pass_index = 0; new_pass_index < enc_pass.storage_pass_len; new_pass_index++) {
|
||||
enc_pass.passwords[password_index * enc_pass.storage_pass_len + new_pass_index] = enc_pass_new[new_pass_index];
|
||||
}
|
||||
}
|
||||
// eeconfig_update_user_datablock(enc_pass.raw);
|
||||
red_write_to_storage();
|
||||
send_string("Successful adding new key on keycode RED_PASS");
|
||||
if (password_index == -1) {
|
||||
if (password_index == 255) {
|
||||
send_byte(enc_pass.password_count);
|
||||
} else {
|
||||
send_byte(password_index);
|
||||
password_index = 255;
|
||||
}
|
||||
send_string("\n");
|
||||
send_string(SS_DELAY(300));
|
||||
password_index = -1;
|
||||
readed_option[0] = 255;
|
||||
send_string(SS_DELAY(1000));
|
||||
CLEAR_MENU_MACROS;
|
||||
send_string("Press `Enter` ");
|
||||
readed_option[0] = SHOW_MAIN_MENU;
|
||||
break;
|
||||
case READING_PASS:
|
||||
return read_new_key(keycode, record);
|
||||
@@ -132,17 +157,18 @@ uint8_t draw_red_menu(uint16_t keycode, keyrecord_t *record) {
|
||||
case ADD_NEW_PASS:
|
||||
if (enc_pass.password_count == enc_pass.storage_size) {
|
||||
send_string("Limit error\n");
|
||||
readed_option[0] = 255;
|
||||
readed_option[0] = SHOW_MAIN_MENU;
|
||||
} else {
|
||||
send_string("Write new password. Tap `Enter` for confirm\n");
|
||||
readed_option[0] = READING_PASS;
|
||||
}
|
||||
break;
|
||||
default: // SHOW_THIS_MENU
|
||||
default: // SHOW_MAIN_MENU
|
||||
CLEAR_MENU_MACROS;
|
||||
send_string("RED_CRYPTO MENU:\n0-EXIT\n1-Show password's names\n2-Show memory usage\n3-Change master key\n4-Change password in storage\n5-Change password's name\n6-Add new password\n");
|
||||
send_string("Choose option(0-6): ");
|
||||
readed_option[0] = READ_USER_CHOICE;
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
return RED_IDLE;
|
||||
}
|
||||
Reference in new issue
Block a user