From db7d19027084d4a4926e5804130d917a4c621dab Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 13 Oct 2022 03:11:33 +0800 Subject: [PATCH] handle bad signature cases with a dialog box --- services/root-keys/locales/i18n.json | 6 ++++++ services/root-keys/src/main.rs | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/services/root-keys/locales/i18n.json b/services/root-keys/locales/i18n.json index c297ddcdf..cfdf64414 100644 --- a/services/root-keys/locales/i18n.json +++ b/services/root-keys/locales/i18n.json @@ -317,6 +317,12 @@ "zh": "取消", "en-tts": "No" }, + "rootkeys.gwup.sig_problem": { + "en": "Invalid signature on update, aborting.", + "ja": "更新時の署名が無効です。中止します。", + "zh": "更新时签名无效,正在中止。", + "en-tts": "Invalid signature on update, aborting." + }, "rootkeys.gwup_starting": { "en": "Updating gateware. This takes a few minutes.\nDo not reset or sleep!", "ja": "ゲートウェアをアップデート中です。これには数分かかります。\nリセットやスリープはしないでください。", diff --git a/services/root-keys/src/main.rs b/services/root-keys/src/main.rs index 6fc09c11d..26d89fea9 100644 --- a/services/root-keys/src/main.rs +++ b/services/root-keys/src/main.rs @@ -884,6 +884,17 @@ fn main() -> ! { SignatureResult::SelfSignOk => t!("rootkeys.gwup.viewinfo_ss", xous::LANG), SignatureResult::ThirdPartyOk => t!("rootkeys.gwup.viewinfo_tp", xous::LANG), SignatureResult::DevKeyOk => t!("rootkeys.gwup.viewinfo_dk", xous::LANG), + SignatureResult::MalformedSignature + | SignatureResult::InvalidPubKey + | SignatureResult::InvalidSignatureType + => { + modals.dynamic_notification_close().expect("modals error"); + modals.show_notification(t!("rootkeys.gwup.sig_problem", xous::LANG), None).expect("modals error"); + if let Some(dr) = deferred_response.take() { + xous::return_scalar(dr, 0).unwrap(); + } + continue; + } _ => { modals.dynamic_notification_close().expect("modals error"); modals.show_notification(t!("rootkeys.gwup.no_update_found", xous::LANG), None).expect("modals error");