From 588001cf8d46a4ff27ed8c6f945e0f8beea06948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 12 Jan 2022 14:52:09 +0100 Subject: [PATCH] api-types: move RsaPubKeyInfo to pbs-client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it's the only thing requiring openssl in pbs-api-types, and it's only used by the client to pretty-print the 'master' key, which is client-specific. Signed-off-by: Fabian Grünbichler --- pbs-api-types/Cargo.toml | 1 - pbs-api-types/src/lib.rs | 33 --------------------------------- 2 files changed, 34 deletions(-) diff --git a/pbs-api-types/Cargo.toml b/pbs-api-types/Cargo.toml index b40a707c..09107ace 100644 --- a/pbs-api-types/Cargo.toml +++ b/pbs-api-types/Cargo.toml @@ -21,4 +21,3 @@ proxmox-uuid = { version = "1.0.0", features = [ "serde" ] } [target.'cfg(not(target_arch="wasm32"))'.dependencies] proxmox-sys = "0.2" # only needed for nodename()?? -openssl = "0.10" diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs index 0a0dd33d..26bef33d 100644 --- a/pbs-api-types/src/lib.rs +++ b/pbs-api-types/src/lib.rs @@ -312,39 +312,6 @@ pub const PASSWORD_HINT_SCHEMA: Schema = StringSchema::new("Password hint.") .schema(); -#[api] -#[derive(Deserialize, Serialize)] -/// RSA public key information -pub struct RsaPubKeyInfo { - /// Path to key (if stored in a file) - #[serde(skip_serializing_if="Option::is_none")] - pub path: Option, - /// RSA exponent - pub exponent: String, - /// Hex-encoded RSA modulus - pub modulus: String, - /// Key (modulus) length in bits - pub length: usize, -} - -#[cfg(not(target_arch="wasm32"))] -impl std::convert::TryFrom> for RsaPubKeyInfo { - type Error = anyhow::Error; - - fn try_from(value: openssl::rsa::Rsa) -> Result { - let modulus = value.n().to_hex_str()?.to_string(); - let exponent = value.e().to_dec_str()?.to_string(); - let length = value.size() as usize * 8; - - Ok(Self { - path: None, - exponent, - modulus, - length, - }) - } -} - #[api()] #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(rename_all = "PascalCase")]