diff options
-rw-r--r-- | hscript/script_v.cc | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/hscript/script_v.cc b/hscript/script_v.cc index bf5c41f..153c4c5 100644 --- a/hscript/script_v.cc +++ b/hscript/script_v.cc @@ -138,24 +138,6 @@ bool add_default_repos(std::vector<std::unique_ptr<Repository>> &repos, std::unique_ptr<Repository> user_repo(user_key); repos.push_back(std::move(user_repo)); -#ifdef NON_LIBRE_FIRMWARE - /* REQ: Runner.Execute.firmware.Repository */ - if(firmware) { - Repository *fw_key = static_cast<Repository *>( - Repository::parseFromData( - "https://distfiles.apkfission.net/adelie/1.0/nonfree", - p, nullptr, nullptr, s - ) - ); - if(!fw_key) { - output_error("internal", - "failed to create firmware repository"); - return false; - } - std::unique_ptr<Repository> fw_repo(fw_key); - repos.push_back(std::move(fw_repo)); - } -#endif /* NON_LIBRE_FIRMWARE */ return true; } @@ -220,29 +202,6 @@ bool add_default_repo_keys(std::vector<std::unique_ptr<SigningKey>> &keys, keys.push_back(std::move(repo_key)); } -#ifdef NON_LIBRE_FIRMWARE - /* REQ: Runner.Execute.signingkey.Firmware */ - if(firmware) { - const std::string base_url = "https://distfiles.adelielinux.org/adelie/keys/"; - SigningKey *fkey = dynamic_cast<SigningKey *>(SigningKey::parseFromData( - base_url + "/packages@pleroma.apkfission.net-5ac0b300.rsa.pub", - {"internal", 0}, nullptr, nullptr, s) - ); - if(!fkey) { - output_error("internal", "failed to create firmware signing key"); - return false; - } - std::unique_ptr<SigningKey> fw_key(fkey); - keys.push_back(std::move(fw_key)); - fkey = dynamic_cast<SigningKey *>(SigningKey::parseFromData( - base_url + "/packages@pleroma.apkfission.net-5ac04808.rsa.pub", - {"", 0}, nullptr, nullptr, s)); - if(fkey) { - std::unique_ptr<SigningKey> fw_key2(fkey); - keys.push_back(std::move(fw_key2)); - } - } -#endif /* NON_LIBRE_FIRMWARE */ return true; } |