switch to production signing key

shipped by proxmox-archive-keyring

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/debcargo.toml b/debian/debcargo.toml
index 245bba5eaa2a8cdecf34352743a739e8dd09c75c..aeda7d9b7b94c32ee70c80833e41c922f0ea1659 100644 (file)
--- a/debian/debcargo.toml
+++ b/debian/debcargo.toml
@@ -14,4 +14,4 @@ repositories and subscription keys:
 - proxmox-offline-mirror (binary for the mirror host with internet access)
 - proxmox-apt-repo (binary for the Proxmox host without internet access)
 """
-depends = ["proxmox-offline-mirror-docs"]
+depends = ["proxmox-offline-mirror-docs", "proxmox-archive-keyring"]

diff --git a/src/bin/proxmox_offline_mirror_cmds/subscription.rs b/src/bin/proxmox_offline_mirror_cmds/subscription.rs
index 9d638f47b24bc0665709b2425894fcc04f124d31..c71ed395237bd818788f861117105317339534ec 100644 (file)
--- a/src/bin/proxmox_offline_mirror_cmds/subscription.rs
+++ b/src/bin/proxmox_offline_mirror_cmds/subscription.rs
@@ -5,6 +5,8 @@ use proxmox_offline_mirror::{
     subscription::{extract_mirror_key, refresh},
     types::{ProductType, PROXMOX_SUBSCRIPTION_KEY_SCHEMA},
 };
+use proxmox_subscription::files::DEFAULT_SIGNING_KEY;
+use proxmox_sys::fs::file_get_contents;
 use serde_json::Value;
 
 use proxmox_router::cli::{
@@ -25,8 +27,7 @@ pub const LIST_KEYS_RETURN_TYPE: ReturnType = ReturnType {
 };
 
 fn public_key() -> Result<openssl::pkey::PKey<openssl::pkey::Public>, Error> {
-    // TODO read from file shipped by proxmox-offline-mirror? make configurable?
-    openssl::pkey::PKey::public_key_from_pem("-----BEGIN PUBLIC KEY-----\nMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEvmzKX6LBz6RXiYjzI4+TLKiLfTKy3h93\nbSn7wEo530zPDYgMTzZLIdXtBAECUmUEtNx5ctro/0ypvLpj7F/fe2gPZwvkNrRQ\nXBgvpyDCfcXgusv9eGhef3jIYKIIlXy8\n-----END PUBLIC KEY-----".as_bytes())
+    openssl::pkey::PKey::public_key_from_pem(&file_get_contents(DEFAULT_SIGNING_KEY)?)
         .map_err(Error::from)
 }