From d3f9715777ee32b7c3d38f8b520597eea2d79a79 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 6 Nov 2019 00:57:45 -0600 Subject: hscript: Implement Runner.Execute.signingkey.Firmware --- hscript/script_v.cc | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'hscript/script_v.cc') diff --git a/hscript/script_v.cc b/hscript/script_v.cc index 9453c62..0052ad2 100644 --- a/hscript/script_v.cc +++ b/hscript/script_v.cc @@ -151,7 +151,7 @@ bool add_default_repos(std::vector> &repos, std::unique_ptr fw_repo(fw_key); repos.push_back(std::move(fw_repo)); } -#endif +#endif /* NON_LIBRE_FIRMWARE */ return true; } @@ -172,6 +172,29 @@ bool add_default_repo_keys(std::vector> &keys) { } std::unique_ptr repo_key(key); keys.push_back(std::move(repo_key)); + +#ifdef NON_LIBRE_FIRMWARE + /* REQ: Runner.Execute.signingkey.Firmware */ + if(firmware) { + SigningKey *fkey = dynamic_cast(SigningKey::parseFromData( + "/etc/apk/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub", + 0, nullptr, nullptr) + ); + if(!fkey) { + output_error("internal", "failed to create firmware signing key"); + return false; + } + std::unique_ptr fw_key(fkey); + keys.push_back(std::move(fw_key)); + fkey = dynamic_cast(SigningKey::parseFromData( + "/etc/apk/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub", + 0, nullptr, nullptr)); + if(fkey) { + std::unique_ptr fw_key2(fkey); + keys.push_back(std::move(fw_key2)); + } + } +#endif /* NON_LIBRE_FIRMWARE */ return true; } -- cgit v1.2.3-60-g2f50