Rename CertKeyData to PublicCredential

Signed-off-by: Wiktor Kwapisiewicz <[email protected]>

Author: wiktor-k

examples/pgp-wrapper.rs

@@ -64,7 +64,7 @@ use service_binding::Binding;
 use ssh_agent_lib::{
     agent::Session,
     client::connect,
-    proto::{CertKeyData, Extension, SignRequest},
+    proto::{Extension, PublicCredential, SignRequest},
 };
 use ssh_key::public::KeyData;
 use tokio::runtime::Runtime;
@@ -372,7 +372,7 @@ fn main() -> testresult::TestResult {
                 let mut keyflags = KeyFlags::default();
                 keyflags.set_encrypt_comms(true);
                 keyflags.set_encrypt_storage(true);
-                let CertKeyData::Key(pubkey) = &decryption_id.pubkey else {
+                let PublicCredential::Key(pubkey) = &decryption_id.pubkey else {
                     panic!("Only pubkeys are supported.");
                 };
                 let pk = ssh_to_pgp(pubkey.clone(), KeyRole::Decryption);
@@ -391,7 +391,7 @@ fn main() -> testresult::TestResult {
                 vec![]
             };
 
-            let CertKeyData::Key(pubkey) = pubkey else {
+            let PublicCredential::Key(pubkey) = pubkey else {
                 panic!("Only pubkeys are supported.");
             };
             let signer = WrappedKey::new(pubkey.clone(), client, KeyRole::Signing);
@@ -417,7 +417,7 @@ fn main() -> testresult::TestResult {
             signed_pk.to_writer(&mut std::io::stdout())?;
         }
         Args::Sign => {
-            let CertKeyData::Key(pubkey) = pubkey else {
+            let PublicCredential::Key(pubkey) = pubkey else {
                 panic!("Only pubkeys are supported.");
             };
             let signer = WrappedKey::new(pubkey.clone(), client, KeyRole::Signing);

src/proto/message.rs

@@ -1,7 +1,7 @@
 //! Agent protocol message structures.
 
 mod add_remove;
-mod cert_key_data;
+mod credential;
 mod extension;
 mod identity;
 mod request;
@@ -10,7 +10,7 @@ mod sign;
 mod unparsed;
 
 pub use self::{
-    add_remove::*, cert_key_data::*, extension::*, identity::*, request::*, response::*, sign::*,
+    add_remove::*, credential::*, extension::*, identity::*, request::*, response::*, sign::*,
     unparsed::*,
 };
 #[doc(hidden)]

src/proto/message/cert_key_data.rs renamed to src/proto/message/credential.rs

@@ -5,14 +5,14 @@ use crate::proto::Error;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 /// Represents a public credential.
-pub enum CertKeyData {
+pub enum PublicCredential {
     /// Plain public key.
     Key(KeyData),
     /// Signed public key.
     Cert(Certificate),
 }
 
-impl CertKeyData {
+impl PublicCredential {
     /// Returns a reference to the [KeyData].
     pub fn key_data(&self) -> &KeyData {
         match self {
@@ -22,7 +22,7 @@ impl CertKeyData {
     }
 }
 
-impl Decode for CertKeyData {
+impl Decode for PublicCredential {
     type Error = Error;
 
     fn decode(reader: &mut impl Reader) -> core::result::Result<Self, Self::Error> {
@@ -31,7 +31,7 @@ impl Decode for CertKeyData {
     }
 }
 
-impl Encode for CertKeyData {
+impl Encode for PublicCredential {
     fn encoded_len(&self) -> std::result::Result<usize, ssh_encoding::Error> {
         match self {
             Self::Key(pubkey) => pubkey.encoded_len(),
@@ -50,13 +50,13 @@ impl Encode for CertKeyData {
     }
 }
 
-impl From<KeyData> for CertKeyData {
+impl From<KeyData> for PublicCredential {
     fn from(value: KeyData) -> Self {
         Self::Key(value)
     }
 }
 
-impl From<Certificate> for CertKeyData {
+impl From<Certificate> for PublicCredential {
     fn from(value: Certificate) -> Self {
         Self::Cert(value)
     }

src/proto/message/identity.rs

@@ -2,7 +2,7 @@
 
 use ssh_encoding::{self, CheckedSum, Decode, Encode, Reader, Writer};
 
-use super::cert_key_data::CertKeyData;
+use super::PublicCredential;
 use crate::proto::{Error, Result};
 
 /// Data returned to the client when listing keys.
@@ -13,7 +13,7 @@ use crate::proto::{Error, Result};
 #[derive(Clone, PartialEq, Debug)]
 pub struct Identity {
     /// A standard public-key encoding of an underlying key.
-    pub pubkey: CertKeyData,
+    pub pubkey: PublicCredential,
 
     /// A human-readable comment
     pub comment: String,
@@ -36,7 +36,7 @@ impl Decode for Identity {
     type Error = Error;
 
     fn decode(reader: &mut impl Reader) -> Result<Self> {
-        let pubkey = reader.read_prefixed(CertKeyData::decode)?;
+        let pubkey = reader.read_prefixed(PublicCredential::decode)?;
         let comment = String::decode(reader)?;
 
         Ok(Self { pubkey, comment })

src/proto/message/sign.rs

@@ -2,7 +2,7 @@
 
 use ssh_encoding::{self, CheckedSum, Decode, Encode, Reader, Writer};
 
-use super::cert_key_data::CertKeyData;
+use super::PublicCredential;
 use crate::proto::{Error, Result};
 
 /// Signature request with data to be signed with a key in an agent.
@@ -13,7 +13,7 @@ use crate::proto::{Error, Result};
 #[derive(Clone, PartialEq, Debug)]
 pub struct SignRequest {
     /// The public key portion of the [`Identity`](super::Identity) in the agent to sign the data with
-    pub pubkey: CertKeyData,
+    pub pubkey: PublicCredential,
 
     /// Binary data to be signed
     pub data: Vec<u8>,
@@ -27,7 +27,7 @@ impl Decode for SignRequest {
     type Error = Error;
 
     fn decode(reader: &mut impl Reader) -> Result<Self> {
-        let pubkey = reader.read_prefixed(CertKeyData::decode)?;
+        let pubkey = reader.read_prefixed(PublicCredential::decode)?;
         let data = Vec::decode(reader)?;
         let flags = u32::decode(reader)?;