eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed key loading

This commit is contained in:
Matthias Fulz 2022-07-26 09:04:00 +02:00
parent 8161c72c75
commit c7d78a05f3
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
quantum/enc/enc.c
View File

@ -278,7 +278,7 @@ int enc_unlock(void) {
enc_config_store(); enc_config_store();
} }
size = 52; size = 64;
uint8_t *keys = decrypt_cbc(size, enc_ctx.cnf.key_store, pw_hash, (uint16_t *)&size); uint8_t *keys = decrypt_cbc(size, enc_ctx.cnf.key_store, pw_hash, (uint16_t *)&size);
if (!keys) { if (!keys) {
return -1; return -1;
@ -971,7 +971,6 @@ int enc_read_key(uint16_t keycode) {
return -1; return -1;
} }
enc_ctx.state.key[enc_ctx.state.key_size] = keycode;
enc_ctx.state.key_size++; enc_ctx.state.key_size++;
} else { } else {
if (enc_ctx.state.key_size != 64) { if (enc_ctx.state.key_size != 64) {
@ -1020,13 +1019,18 @@ bool process_record_enc(uint16_t keycode, keyrecord_t *record) {
return false; return false;
} }
if (!enc_ctx.state.pw_check_ready && enc_ctx.state.pw_ready && enc_ctx.state.seed_ready) { if (!enc_ctx.state.pw_check_ready && enc_ctx.state.pw_ready && enc_ctx.state.seed_ready) {
int ret = enc_read_pw_check(keycode); int ret = enc_read_pw_check(keycode);
if (ret != 0) { if (ret != 0) {
enc_switch_mode(ENC_MODE_CLOSED); enc_switch_mode(ENC_MODE_CLOSED);
return false;
} }
return false; if (!enc_ctx.state.pw_check_ready) {
} else { return false;
}
}
if (enc_ctx.state.pw_check_ready && enc_ctx.state.pw_ready && enc_ctx.state.seed_ready) {
if (initialize_enc(NULL, NULL, false) != 0) { if (initialize_enc(NULL, NULL, false) != 0) {
enc_switch_mode(ENC_MODE_CLOSED); enc_switch_mode(ENC_MODE_CLOSED);
} else { } else {
@ -1089,7 +1093,9 @@ bool process_record_enc(uint16_t keycode, keyrecord_t *record) {
enc_switch_mode(ENC_MODE_CLOSED); enc_switch_mode(ENC_MODE_CLOSED);
} }
return false; return false;
} else { }
if (enc_ctx.state.pw_check_ready && enc_ctx.state.pw_ready && enc_ctx.state.seed_ready) {
if (initialize_enc(NULL, NULL, true) != 0) { if (initialize_enc(NULL, NULL, true) != 0) {
enc_switch_mode(ENC_MODE_CLOSED); enc_switch_mode(ENC_MODE_CLOSED);
} else { } else {
@ -1381,6 +1387,21 @@ void enc_write_oled(bool invert) {
oled_write_P(PSTR("E: LOAD - Enter Password\n"), invert); oled_write_P(PSTR("E: LOAD - Enter Password\n"), invert);
return; return;
case ENC_MODE_INIT: case ENC_MODE_INIT:
oled_write_P(PSTR("E: INIT - "), invert);
switch (enc_ctx.mode.sub_mode) {
case ENC_SUB_MODE_SEED:
oled_write_P(PSTR("Enter Seed"), invert);
break;
case ENC_SUB_MODE_PASSWORD:
oled_write_P(PSTR("Enter Password"), invert);
break;
case ENC_SUB_MODE_VERIFY_PASSWORD:
oled_write_P(PSTR("Enter Password again"), invert);
break;
}
oled_write_P(PSTR("\n"), invert);
return;
case ENC_MODE_KEY:
oled_write_P(PSTR("E: INIT - "), invert); oled_write_P(PSTR("E: INIT - "), invert);
switch (enc_ctx.mode.sub_mode) { switch (enc_ctx.mode.sub_mode) {
case ENC_SUB_MODE_SEED: case ENC_SUB_MODE_SEED:
@ -1395,7 +1416,7 @@ void enc_write_oled(bool invert) {
case ENC_SUB_MODE_KEY: case ENC_SUB_MODE_KEY:
oled_write_P(PSTR("Enter Key in hex"), invert); oled_write_P(PSTR("Enter Key in hex"), invert);
break; break;
} }
oled_write_P(PSTR("\n"), invert); oled_write_P(PSTR("\n"), invert);
return; return;
default: default: