Rename SignRequest::pubkey to credential for clarity

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

Author: wiktor-k

examples/key-storage.rs

@@ -74,7 +74,7 @@ impl KeyStorage {
 #[crate::async_trait]
 impl Session for KeyStorage {
     async fn sign(&mut self, sign_request: SignRequest) -> Result<Signature, AgentError> {
-        let pubkey: PublicKey = sign_request.pubkey.key_data().clone().into();
+        let pubkey: PublicKey = sign_request.credential.key_data().clone().into();
 
         if let Some(identity) = self.identity_from_pubkey(&pubkey) {
             match identity.privkey.key_data() {

examples/random-key.rs

@@ -41,7 +41,7 @@ impl RandomKey {
 impl Session for RandomKey {
     async fn sign(&mut self, sign_request: SignRequest) -> Result<Signature, AgentError> {
         let private_key = self.private_key.lock().unwrap();
-        let PublicCredential::Key(pubkey) = sign_request.pubkey else {
+        let PublicCredential::Key(pubkey) = sign_request.credential else {
             return Err(std::io::Error::other("Key not found").into());
         };
         if PublicKey::from(private_key.deref()).key_data() != &pubkey {

src/proto/message/request.rs

@@ -164,7 +164,7 @@ mod tests {
         let Request::SignRequest(req) = req else {
             panic!("expected SignRequest");
         };
-        let PublicCredential::Cert(cert) = req.pubkey else {
+        let PublicCredential::Cert(cert) = req.credential else {
             panic!("expected certificate");
         };
         assert_eq!(cert.algorithm(), Algorithm::Rsa { hash: None });
@@ -177,7 +177,7 @@ mod tests {
         let Request::SignRequest(req) = req else {
             panic!("expected SignRequest");
         };
-        let PublicCredential::Key(cert) = req.pubkey else {
+        let PublicCredential::Key(cert) = req.credential else {
             panic!("expected key");
         };
         assert_eq!(cert.algorithm(), Algorithm::Rsa { hash: None });

src/proto/message/sign.rs

@@ -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: PublicCredential,
+    pub credential: PublicCredential,
 
     /// Binary data to be signed
     pub data: Vec<u8>,
@@ -32,7 +32,7 @@ impl Decode for SignRequest {
         let flags = u32::decode(reader)?;
 
         Ok(Self {
-            pubkey,
+            credential: pubkey,
             data,
             flags,
         })
@@ -42,15 +42,15 @@ impl Decode for SignRequest {
 impl Encode for SignRequest {
     fn encoded_len(&self) -> ssh_encoding::Result<usize> {
         [
-            self.pubkey.encoded_len_prefixed()?,
+            self.credential.encoded_len_prefixed()?,
             self.data.encoded_len()?,
             self.flags.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.data.encode(writer)?;
         self.flags.encode(writer)?;