feat(core): improve optiga initialization error handling

[no changelog]
trezor · Jul 31, 2024 · 52437b1 · 52437b1
1 parent 9746308
commit 52437b1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/embed/firmware/main.c b/core/embed/firmware/main.c
@@ -228,11 +228,17 @@ int main(void) {
 #endif
 
   optiga_init();
-  optiga_open_application();
   if (sectrue == secret_ok) {
-    optiga_sec_chan_handshake(secret, sizeof(secret));
+    // If the shielded connection cannot be established, reset Optiga and
+    // continue without it. In this case, OID_KEY_FIDO and OID_KEY_DEV cannot be
+    // used, which means device and FIDO attestation will not work.
+    if (optiga_sec_chan_handshake(secret, sizeof(secret)) != OPTIGA_SUCCESS) {
+      optiga_soft_reset();
+    }
   }
   memzero(secret, sizeof(secret));
+  ensure(sectrue * (optiga_open_application() == OPTIGA_SUCCESS),
+         "Cannot initialize optiga.");
 #endif
 
 #if !defined TREZOR_MODEL_1