mfulz_github
/
qmk_firmware
mirror of https://github.com/mfulz/qmk_firmware.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'features/encryption' into enc_master

This commit is contained in:
Matthias Fulz 2022-07-26 12:50:58 +02:00
parent f5d4b4f86f f6d7770a85
commit 143a1afccb
2 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
quantum/enc/enc.c
View File

@ -177,6 +177,7 @@ void enc_clear_ctx(void) {
memset(enc_ctx.state.pw, 0, 32 * sizeof(uint16_t)); memset(enc_ctx.state.pw, 0, 32 * sizeof(uint16_t));
memset(enc_ctx.state.pw_check, 0, 32 * sizeof(uint16_t)); memset(enc_ctx.state.pw_check, 0, 32 * sizeof(uint16_t));
memset(enc_ctx.state.key, 0, 64 * sizeof(uint8_t)); memset(enc_ctx.state.key, 0, 64 * sizeof(uint8_t));
memset(enc_ctx.mode.key, 0, 64 * sizeof(uint8_t));
enc_ctx.state.pw_ready = false; enc_ctx.state.pw_ready = false;
enc_ctx.state.pw_check_ready = false; enc_ctx.state.pw_check_ready = false;
@ -184,6 +185,7 @@ void enc_clear_ctx(void) {
enc_ctx.state.pw_size = 0; enc_ctx.state.pw_size = 0;
enc_ctx.state.pw_check_size = 0; enc_ctx.state.pw_check_size = 0;
enc_ctx.state.key_size = 0; enc_ctx.state.key_size = 0;
enc_ctx.mode.key_size = 0;
enc_ctx.state.seed = 0; enc_ctx.state.seed = 0;
#ifdef ENC_HW_RND #ifdef ENC_HW_RND
enc_ctx.state.seed_ready = true; enc_ctx.state.seed_ready = true;
@ -199,6 +201,8 @@ void enc_clear_ctx(void) {
void enc_switch_mode(uint8_t mode) { void enc_switch_mode(uint8_t mode) {
enc_ctx.mode.sub_mode = ENC_SUB_MODE_NONE; enc_ctx.mode.sub_mode = ENC_SUB_MODE_NONE;
enc_ctx.mode.key_size = 0;
memset(enc_ctx.mode.key, 0, 64 * sizeof(uint8_t));
switch (mode) { switch (mode) {
case ENC_MODE_CLOSED: case ENC_MODE_CLOSED:
@ -916,68 +920,87 @@ int enc_read_key(uint16_t keycode) {
if (!enc_ctx.state.key_ready) { if (!enc_ctx.state.key_ready) {
if (keycode != KC_ENT) { if (keycode != KC_ENT) {
if (enc_ctx.state.key_size >= 64) { if (enc_ctx.state.key_size >= 64) {
return -1; return 0;
} }
switch (keycode) { switch (keycode) {
case KC_A: case KC_A:
enc_ctx.state.key[enc_ctx.state.key_size] = 'a'; enc_ctx.state.key[enc_ctx.state.key_size] = 'a';
enc_ctx.mode.key[enc_ctx.state.key_size] = 'A';
break; break;
case KC_B: case KC_B:
enc_ctx.state.key[enc_ctx.state.key_size] = 'b'; enc_ctx.state.key[enc_ctx.state.key_size] = 'b';
enc_ctx.mode.key[enc_ctx.state.key_size] = 'B';
break; break;
case KC_C: case KC_C:
enc_ctx.state.key[enc_ctx.state.key_size] = 'c'; enc_ctx.state.key[enc_ctx.state.key_size] = 'c';
enc_ctx.mode.key[enc_ctx.state.key_size] = 'C';
break; break;
case KC_D: case KC_D:
enc_ctx.state.key[enc_ctx.state.key_size] = 'd'; enc_ctx.state.key[enc_ctx.state.key_size] = 'd';
enc_ctx.mode.key[enc_ctx.state.key_size] = 'D';
break; break;
case KC_E: case KC_E:
enc_ctx.state.key[enc_ctx.state.key_size] = 'e'; enc_ctx.state.key[enc_ctx.state.key_size] = 'e';
enc_ctx.mode.key[enc_ctx.state.key_size] = 'E';
break; break;
case KC_F: case KC_F:
enc_ctx.state.key[enc_ctx.state.key_size] = 'f'; enc_ctx.state.key[enc_ctx.state.key_size] = 'f';
enc_ctx.mode.key[enc_ctx.state.key_size] = 'F';
break; break;
case KC_0: case KC_0:
enc_ctx.state.key[enc_ctx.state.key_size] = '0'; enc_ctx.state.key[enc_ctx.state.key_size] = '0';
enc_ctx.mode.key[enc_ctx.state.key_size] = '0';
break; break;
case KC_1: case KC_1:
enc_ctx.state.key[enc_ctx.state.key_size] = '1'; enc_ctx.state.key[enc_ctx.state.key_size] = '1';
enc_ctx.mode.key[enc_ctx.state.key_size] = '1';
break; break;
case KC_2: case KC_2:
enc_ctx.state.key[enc_ctx.state.key_size] = '2'; enc_ctx.state.key[enc_ctx.state.key_size] = '2';
enc_ctx.mode.key[enc_ctx.state.key_size] = '2';
break; break;
case KC_3: case KC_3:
enc_ctx.state.key[enc_ctx.state.key_size] = '3'; enc_ctx.state.key[enc_ctx.state.key_size] = '3';
enc_ctx.mode.key[enc_ctx.state.key_size] = '3';
break; break;
case KC_4: case KC_4:
enc_ctx.state.key[enc_ctx.state.key_size] = '4'; enc_ctx.state.key[enc_ctx.state.key_size] = '4';
enc_ctx.mode.key[enc_ctx.state.key_size] = '4';
break; break;
case KC_5: case KC_5:
enc_ctx.state.key[enc_ctx.state.key_size] = '5'; enc_ctx.state.key[enc_ctx.state.key_size] = '5';
enc_ctx.mode.key[enc_ctx.state.key_size] = '5';
break; break;
case KC_6: case KC_6:
enc_ctx.state.key[enc_ctx.state.key_size] = '6'; enc_ctx.state.key[enc_ctx.state.key_size] = '6';
enc_ctx.mode.key[enc_ctx.state.key_size] = '6';
break; break;
case KC_7: case KC_7:
enc_ctx.state.key[enc_ctx.state.key_size] = '7'; enc_ctx.state.key[enc_ctx.state.key_size] = '7';
enc_ctx.mode.key[enc_ctx.state.key_size] = '7';
break; break;
case KC_8: case KC_8:
enc_ctx.state.key[enc_ctx.state.key_size] = '8'; enc_ctx.state.key[enc_ctx.state.key_size] = '8';
enc_ctx.mode.key[enc_ctx.state.key_size] = '8';
break; break;
case KC_9: case KC_9:
enc_ctx.state.key[enc_ctx.state.key_size] = '9'; enc_ctx.state.key[enc_ctx.state.key_size] = '9';
enc_ctx.mode.key[enc_ctx.state.key_size] = '9';
break; break;
case KC_BSPC: case KC_BSPC:
enc_ctx.state.key_size--; enc_ctx.state.key_size--;
enc_ctx.mode.key_size--;
if (enc_ctx.state.key_size < 0) { if (enc_ctx.state.key_size < 0) {
enc_ctx.state.key_size = 0; enc_ctx.state.key_size = 0;
enc_ctx.mode.key_size = 0;
} }
return 0; return 0;
default: default:
return -1; return 0;
} }
enc_ctx.state.key_size++; enc_ctx.state.key_size++;
enc_ctx.mode.key_size++;
} else { } else {
if (enc_ctx.state.key_size != 64) { if (enc_ctx.state.key_size != 64) {
return -1; return -1;
@ -1378,13 +1401,13 @@ const char *enc_bool_to_str(int val) {
void enc_write_oled(bool invert) { void enc_write_oled(bool invert) {
#ifdef OLED_ENABLE #ifdef OLED_ENABLE
oled_set_cursor(0, 0);
for (int i = 0; i < oled_max_lines(); i++) { for (int i = 0; i < oled_max_lines(); i++) {
for (int j = 0; j < oled_max_chars(); j++) { for (int j = 0; j < oled_max_chars(); j++) {
oled_set_cursor(i, j); oled_write_char(' ', invert);
oled_write_P(PSTR(" "), false);
} }
} }
oled_set_cursor(0, 0); /*oled_clear();*/
switch (enc_ctx.mode.mode) { switch (enc_ctx.mode.mode) {
case ENC_MODE_OPEN: case ENC_MODE_OPEN:
@ -1415,7 +1438,7 @@ void enc_write_oled(bool invert) {
oled_write_P(PSTR("\n"), invert); oled_write_P(PSTR("\n"), invert);
return; return;
case ENC_MODE_KEY: case ENC_MODE_KEY:
oled_write_P(PSTR("E: INIT - "), invert); oled_write_P(PSTR("E: KEY - "), invert);
switch (enc_ctx.mode.sub_mode) { switch (enc_ctx.mode.sub_mode) {
case ENC_SUB_MODE_SEED: case ENC_SUB_MODE_SEED:
oled_write_P(PSTR("Enter Seed"), invert); oled_write_P(PSTR("Enter Seed"), invert);
@ -1427,7 +1450,23 @@ void enc_write_oled(bool invert) {
oled_write_P(PSTR("Enter Password again"), invert); oled_write_P(PSTR("Enter Password again"), invert);
break; break;
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\n"), invert);
uint8_t block_num = (enc_ctx.mode.key_size-1) / 8;
oled_write_char('B', invert);
oled_write(get_u8_str(block_num, '0'), invert);
oled_write_P(PSTR(": "), invert);
bool space = false;
for (int i = 0 + (block_num * 8); i < enc_ctx.mode.key_size; i++) {
if (space) {
oled_write_char(' ', invert);
}
oled_write_char(enc_ctx.mode.key[i], invert);
if (i > 0 && (((i+1) % 2) == 0)) {
space = true;
} else {
space = false;
}
}
break; break;
} }
oled_write_P(PSTR("\n"), invert); oled_write_P(PSTR("\n"), invert);
@ -1444,19 +1483,19 @@ void enc_write_oled(bool invert) {
oled_write(get_u8_str(enc_ctx.mode.req_timeout, ' '), invert); oled_write(get_u8_str(enc_ctx.mode.req_timeout, ' '), invert);
oled_write_P(PSTR("s\n"), invert); oled_write_P(PSTR("s\n"), invert);
return; return;
} } else {
oled_write_P(PSTR("EF:I P S ME EC TO\n"), invert); oled_write_P(PSTR("EF:I P S ME EC TO\n"), invert);
oled_write_P(PSTR(" "), invert); oled_write_P(PSTR(" "), invert);
oled_write_P(PSTR(enc_bool_to_str(enc_ctx.cnf.flags.initialized)), invert); oled_write_P(PSTR(enc_bool_to_str(enc_ctx.cnf.flags.initialized)), invert);
oled_write_P(PSTR(" "), invert); oled_write_char(' ', invert);
oled_write_P(PSTR(enc_bool_to_str(enc_ctx.cnf.flags.paranoia_mode)), invert); oled_write_P(PSTR(enc_bool_to_str(enc_ctx.cnf.flags.paranoia_mode)), invert);
oled_write_P(PSTR(" "), invert); oled_write_char(' ', invert);
oled_write_P(PSTR(enc_bool_to_str(enc_ctx.cnf.flags.secure_mode)), invert); oled_write_P(PSTR(enc_bool_to_str(enc_ctx.cnf.flags.secure_mode)), invert);
oled_write(get_u8_str(enc_ctx.cnf.flags.max_error, ' '), invert); oled_write(get_u8_str(enc_ctx.cnf.flags.max_error, ' '), invert);
oled_write(get_u8_str(enc_ctx.cnf.flags.error_count, ' '), invert); oled_write(get_u8_str(enc_ctx.cnf.flags.error_count, ' '), invert);
oled_write(get_u8_str(enc_ctx.cnf.flags.timeout, ' '), invert); oled_write(get_u8_str(enc_ctx.cnf.flags.timeout, ' '), invert);
oled_write_P(PSTR("\n"), invert); oled_write_char('\n', invert);
}
#else #else
return; return;
#endif #endif

3
quantum/enc/enc.h
View File

@ -96,6 +96,9 @@ typedef struct {
uint8_t req_cmd; uint8_t req_cmd;
uint32_t req_timeout; uint32_t req_timeout;
bool req_timeout_enabled; bool req_timeout_enabled;
// key just temporary
uint8_t key[64];
uint16_t key_size;
} enc_mode_t; } enc_mode_t;
typedef struct { typedef struct {