hotp: display keys on screen

tock · Jun 19, 2024 · 4d23d47 · 4d23d47
1 parent bf3477b
commit 4d23d47
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 0 deletions.
diff --git a/examples/tutorials/hotp/hotp_milestone_one/Makefile b/examples/tutorials/hotp/hotp_milestone_one/Makefile
@@ -6,6 +6,9 @@ TOCK_USERLAND_BASE_DIR = ../../../../
 # Which files to compile.
 C_SRCS := $(wildcard *.c)
 
+# Include U8G2 graphics library.
+EXTERN_LIBS += $(TOCK_USERLAND_BASE_DIR)/u8g2
+
 # Include userland master makefile. Contains rules and flags for actually
 # building the application.
 include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
diff --git a/examples/tutorials/hotp/hotp_milestone_one/main.c b/examples/tutorials/hotp/hotp_milestone_one/main.c
@@ -26,6 +26,7 @@
 // Local includes
 #include "base32.h"
 #include "step0.h"
+#include "screen.h"
 
 
 // --- Definitions for HOTP App ---
@@ -108,6 +109,8 @@ int main(void) {
   // Configure a default HOTP secret
   program_default_secret(&stored_key);
 
+  display_hotp_keys(&stored_key, 1);
+
   // Main loop. Waits for button presses
   while (true) {
     // Yield until a button is pressed
@@ -123,10 +126,12 @@ int main(void) {
     // Handle long presses (program new secret)
     if (new_val) {
       program_new_secret(&stored_key);
+      display_hotp_keys(&stored_key, 1);
 
       // Handle short presses on already configured keys (output next code)
     } else if (stored_key.len > 0) {
       get_next_code(&stored_key, KEY_DIGITS);
+      display_hotp_keys(&stored_key, 1);
 
       // Error for short press on a non-configured key
     } else if (stored_key.len == 0) {

diff --git a/examples/tutorials/hotp/hotp_milestone_three/Makefile b/examples/tutorials/hotp/hotp_milestone_three/Makefile
@@ -9,6 +9,9 @@ C_SRCS := $(wildcard *.c)
 # Make sure we have storage permissions.
 ELF2TAB_ARGS += --write_id 0x4016 --read_ids 0x4016 --access_ids 0x4016
 
+# Include U8G2 graphics library.
+EXTERN_LIBS += $(TOCK_USERLAND_BASE_DIR)/u8g2
+
 # Include userland master makefile. Contains rules and flags for actually
 # building the application.
 include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
diff --git a/examples/tutorials/hotp/hotp_milestone_three/main.c b/examples/tutorials/hotp/hotp_milestone_three/main.c
@@ -20,6 +20,7 @@
 #include "step0.h"
 #include "step1.h"
 #include "step2.h"
+#include "screen.h"
 
 
 // --- Definitions for HOTP App ---
@@ -65,6 +66,8 @@ int main(void) {
     program_default_secret(&stored_keys[0]);
   }
 
+  display_hotp_keys(stored_keys, NUM_KEYS);
+
   // Main loop. Waits for button presses
   while (true) {
     // Yield until a button is pressed
@@ -81,11 +84,13 @@ int main(void) {
     if (new_val) {
       program_new_secret(&stored_keys[btn_num]);
       save_key(&stored_keys[btn_num], btn_num);
+      display_hotp_keys(stored_keys, NUM_KEYS);
 
     } else if (btn_num < NUM_KEYS && stored_keys[btn_num].len > 0) {
       // Handle short presses on already configured keys (output next code).
       get_next_code(&stored_keys[btn_num], key_digits[btn_num]);
       save_key(&stored_keys[btn_num], btn_num);
+      display_hotp_keys(stored_keys, NUM_KEYS);
 
     } else if (stored_keys[btn_num].len == 0) {
       // Error for short press on a non-configured key.

diff --git a/examples/tutorials/hotp/hotp_milestone_three/screen.c b/examples/tutorials/hotp/hotp_milestone_three/screen.c
@@ -0,0 +1 @@
+../hotp_milestone_one/screen.c
diff --git a/examples/tutorials/hotp/hotp_milestone_three/screen.h b/examples/tutorials/hotp/hotp_milestone_three/screen.h
@@ -0,0 +1 @@
+../hotp_milestone_one/screen.h
diff --git a/examples/tutorials/hotp/hotp_milestone_two/Makefile b/examples/tutorials/hotp/hotp_milestone_two/Makefile
@@ -9,6 +9,9 @@ C_SRCS := $(wildcard *.c)
 # Make sure we have storage permissions.
 ELF2TAB_ARGS += --write_id 0x4016 --read_ids 0x4016 --access_ids 0x4016
 
+# Include U8G2 graphics library.
+EXTERN_LIBS += $(TOCK_USERLAND_BASE_DIR)/u8g2
+
 # Include userland master makefile. Contains rules and flags for actually
 # building the application.
 include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
diff --git a/examples/tutorials/hotp/hotp_milestone_two/main.c b/examples/tutorials/hotp/hotp_milestone_two/main.c
@@ -27,6 +27,7 @@
 #include "base32.h"
 #include "step0.h"
 #include "step1.h"
+#include "screen.h"
 
 
 // --- Definitions for HOTP App ---
@@ -108,6 +109,8 @@ int main(void) {
     program_default_secret(&stored_key);
   }
 
+  display_hotp_keys(&stored_key, 1);
+
   // Main loop. Waits for button presses
   while (true) {
     // Yield until a button is pressed
@@ -124,11 +127,13 @@ int main(void) {
     if (new_val) {
       program_new_secret(&stored_key);
       save_key(&stored_key, 0);
+      display_hotp_keys(&stored_key, 1);
 
       // Handle short presses on already configured keys (output next code)
     } else if (stored_key.len > 0) {
       get_next_code(&stored_key, KEY_DIGITS);
       save_key(&stored_key, 0);
+      display_hotp_keys(&stored_key, 1);
 
       // Error for short press on a non-configured key
     } else if (stored_key.len == 0) {

diff --git a/examples/tutorials/hotp/hotp_milestone_two/screen.c b/examples/tutorials/hotp/hotp_milestone_two/screen.c
@@ -0,0 +1 @@
+../hotp_milestone_one/screen.c
diff --git a/examples/tutorials/hotp/hotp_milestone_two/screen.h b/examples/tutorials/hotp/hotp_milestone_two/screen.h
@@ -0,0 +1 @@
+../hotp_milestone_one/screen.h