Rename Identity::pubkey to credential for clarity

Signed-off-by: Wiktor Kwapisiewicz <wiktor@metacode.biz>

Author: wiktor-k

examples/agent-socket-info.rs

@@ -27,7 +27,7 @@ impl Session for AgentSocketInfo {
     async fn request_identities(&mut self) -> Result<Vec<Identity>, AgentError> {
         Ok(vec![Identity {
             // this is just a dummy key, the comment is important
-            pubkey: KeyData::Ed25519(ssh_key::public::Ed25519PublicKey([0; 32])).into(),
+            credential: KeyData::Ed25519(ssh_key::public::Ed25519PublicKey([0; 32])).into(),
             comment: self.comment.clone(),
         }])
     }

examples/key-storage.rs

@@ -122,7 +122,7 @@ impl Session for KeyStorage {
         let mut identities = vec![];
         for identity in self.identities.lock().unwrap().iter() {
             identities.push(message::Identity {
-                pubkey: identity.pubkey.key_data().clone().into(),
+                credential: identity.pubkey.key_data().clone().into(),
                 comment: identity.comment.clone(),
             })
         }

examples/random-key.rs

@@ -88,7 +88,7 @@ impl Session for RandomKey {
     async fn request_identities(&mut self) -> Result<Vec<Identity>, AgentError> {
         let identity = self.private_key.lock().unwrap();
         Ok(vec![Identity {
-            pubkey: PublicCredential::Key(PublicKey::from(identity.deref()).into()),
+            credential: PublicCredential::Key(PublicKey::from(identity.deref()).into()),
             comment: identity.comment().into(),
         }])
     }

src/proto/message/identity.rs

@@ -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: PublicCredential,
+    pub credential: PublicCredential,
 
     /// A human-readable comment
     pub comment: String,
@@ -36,24 +36,27 @@ impl Decode for Identity {
     type Error = Error;
 
     fn decode(reader: &mut impl Reader) -> Result<Self> {
-        let pubkey = reader.read_prefixed(PublicCredential::decode)?;
+        let credential = reader.read_prefixed(PublicCredential::decode)?;
         let comment = String::decode(reader)?;
 
-        Ok(Self { pubkey, comment })
+        Ok(Self {
+            credential,
+            comment,
+        })
     }
 }
 
 impl Encode for Identity {
     fn encoded_len(&self) -> ssh_encoding::Result<usize> {
         [
-            self.pubkey.encoded_len_prefixed()?,
+            self.credential.encoded_len_prefixed()?,
             self.comment.encoded_len()?,
         ]
         .checked_sum()
     }
 
     fn encode(&self, writer: &mut impl Writer) -> ssh_encoding::Result<()> {
-        self.pubkey.encode_prefixed(writer)?;
+        self.credential.encode_prefixed(writer)?;
         self.comment.encode(writer)?;
 
         Ok(())

src/proto/message/request.rs

@@ -193,7 +193,7 @@ mod tests {
             panic!("expected IdentitiesAnswer");
         };
         assert_eq!(resp.len(), 4);
-        let PublicCredential::Cert(cert) = &resp[3].pubkey else {
+        let PublicCredential::Cert(cert) = &resp[3].credential else {
             panic!("expected certificate");
         };
         assert_eq!(cert.algorithm(), Algorithm::Rsa { hash: None });
@@ -209,7 +209,7 @@ mod tests {
             panic!("expected IdentitiesAnswer");
         };
         assert_eq!(resp.len(), 1);
-        let PublicCredential::Key(key) = &resp[0].pubkey else {
+        let PublicCredential::Key(key) = &resp[0].credential else {
             panic!("expected key");
         };
         assert_eq!(key.algorithm(), Algorithm::Rsa { hash: None });

tests/roundtrip/expected/resp_parse_identities.rs

@@ -5,7 +5,7 @@ use super::fixtures;
 
 pub fn expected() -> Response {
     Response::IdentitiesAnswer(vec![Identity {
-        pubkey: KeyData::Ecdsa(fixtures::demo_key().into()).into(),
+        credential: KeyData::Ecdsa(fixtures::demo_key().into()).into(),
         comment: "baloo@angela".to_string(),
     }])
 }