diff options
Diffstat (limited to 'kbc.c')
| -rw-r--r-- | kbc.c | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -2,12 +2,13 @@ #include <stdint.h> #include <string.h> #include <avr/io.h> #include <avr/interrupt.h> #include <avr/sleep.h> #include <avr/pgmspace.h> +#include <avr/eeprom.h> #include <util/delay.h> #ifndef PIN #error need to define a PIN #endif @@ -328,13 +329,13 @@ static uint8_t wait_byte(void) static uint8_t cntr = 0; #ifdef KILLSWITCH static uint8_t error; #endif -static const char passwd[sizeof(PIN) - 1] = PIN; +static const EEMEM char passwd[sizeof(PIN) - 1] = PIN; static char code[sizeof(PIN)]; static void state_enter(void) { switch (state) { case STATE_NONE: @@ -540,23 +541,32 @@ static void handle_keypress(uint8_t data) dbg_wr(0x80 | (ascii >> 4)); lock = ascii == ESC; unlock = ascii == ENT || data == NUMPAD_ENTER; if (lock || unlock) { + uint8_t eebyte, pos, ok = 1; + /* passwd: a b c d * code: \0 a b c d */ + + if (code[0]) + ok = 0; #ifdef KILLSWITCH - if (code[0] || !memcmp("9164", code + 1, 4)) { + if (!memcmp("9164", code + 1, 4)) { error = 0; nextstate = STATE_ERROR; return; } #endif - if (code[0] || memcmp(passwd, code + 1, sizeof(passwd))) { + for (pos = 1; pos < sizeof(code); pos++) + if (code[pos] != eeprom_read_byte(passwd + pos - 1)) + ok = 0; + + if (!ok) { dbg_wr(0x20); nextstate = STATE_REJECT; } else { dbg_wr(lock ? 0x21 : 0x22); nextstate = STATE_ACCEPT; } |