diff --git a/crates/bitwarden-exporters/src/lib.rs b/crates/bitwarden-exporters/src/lib.rs index f6bb8dbf..c11e4d96 100644 --- a/crates/bitwarden-exporters/src/lib.rs +++ b/crates/bitwarden-exporters/src/lib.rs @@ -137,9 +137,9 @@ pub struct Identity { pub struct SshKey { /// [OpenSSH private key](https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.key), in PEM encoding. - pub private_key: Option, + pub private_key: String, /// Ssh public key (ed25519/rsa) according to [RFC4253](https://datatracker.ietf.org/doc/html/rfc4253#section-6.6) - pub public_key: Option, + pub public_key: String, /// SSH fingerprint using SHA256 in the format: `SHA256:BASE64_ENCODED_FINGERPRINT` - pub fingerprint: Option, + pub fingerprint: String, } diff --git a/crates/bitwarden-exporters/src/models.rs b/crates/bitwarden-exporters/src/models.rs index 1c23066f..1d2e80d9 100644 --- a/crates/bitwarden-exporters/src/models.rs +++ b/crates/bitwarden-exporters/src/models.rs @@ -77,9 +77,9 @@ impl TryFrom for crate::Cipher { CipherType::SshKey => { let s = require!(value.ssh_key); crate::CipherType::SshKey(Box::new(crate::SshKey { - private_key: Some(s.private_key), - public_key: Some(s.public_key), - fingerprint: Some(s.fingerprint), + private_key: s.private_key, + public_key: s.public_key, + fingerprint: s.fingerprint, })) } };