Rename Credential to PrivateCredential

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

Author: wiktor-k

examples/key-storage.rs

@@ -12,8 +12,8 @@ use ssh_agent_lib::agent::{listen, Session};
 use ssh_agent_lib::error::AgentError;
 use ssh_agent_lib::proto::extension::{QueryResponse, RestrictDestination, SessionBind};
 use ssh_agent_lib::proto::{
-    message, signature, AddIdentity, AddIdentityConstrained, AddSmartcardKeyConstrained,
-    Credential, Extension, KeyConstraint, RemoveIdentity, SignRequest, SmartcardKey,
+    message, signature, AddIdentity, AddIdentityConstrained, AddSmartcardKeyConstrained, Extension,
+    KeyConstraint, PrivateCredential, RemoveIdentity, SignRequest, SmartcardKey,
 };
 use ssh_key::{
     private::{KeypairData, PrivateKey},
@@ -121,7 +121,7 @@ impl Session for KeyStorage {
     }
 
     async fn add_identity(&mut self, identity: AddIdentity) -> Result<(), AgentError> {
-        if let Credential::Key { privkey, comment } = identity.credential {
+        if let PrivateCredential::Key { privkey, comment } = identity.credential {
             let privkey = PrivateKey::try_from(privkey).map_err(AgentError::other)?;
             self.identity_add(Identity {
                 pubkey: PublicKey::from(&privkey),
@@ -152,7 +152,7 @@ impl Session for KeyStorage {
                     info!("Destination constraint: {destination:?}");
                 }
 
-                if let Credential::Key { privkey, comment } = identity.credential.clone() {
+                if let PrivateCredential::Key { privkey, comment } = identity.credential.clone() {
                     let privkey = PrivateKey::try_from(privkey).map_err(AgentError::other)?;
                     self.identity_add(Identity {
                         pubkey: PublicKey::from(&privkey),

src/proto/message/add_remove.rs

@@ -20,14 +20,14 @@ use crate::proto::{Error, Result};
 #[derive(Clone, PartialEq, Debug)]
 pub struct AddIdentity {
     /// A credential (private & public key, or private key / certificate) to add to the agent
-    pub credential: Credential,
+    pub credential: PrivateCredential,
 }
 
 impl Decode for AddIdentity {
     type Error = Error;
 
     fn decode(reader: &mut impl Reader) -> Result<Self> {
-        let credential = Credential::decode(reader)?;
+        let credential = PrivateCredential::decode(reader)?;
 
         Ok(Self { credential })
     }

src/proto/message/add_remove/credential.rs

@@ -16,7 +16,7 @@ use crate::proto::{Error, PrivateKeyData, Result};
 /// This structure covers both types of identities a user may
 /// send to an agent as part of a [`Request::AddIdentity`](crate::proto::Request::AddIdentity) message.
 #[derive(Clone, PartialEq, Debug)]
-pub enum Credential {
+pub enum PrivateCredential {
     /// A public/private key pair
     Key {
         /// Public/private key pair data
@@ -42,7 +42,7 @@ pub enum Credential {
     },
 }
 
-impl Decode for Credential {
+impl Decode for PrivateCredential {
     type Error = Error;
 
     fn decode(reader: &mut impl Reader) -> Result<Self> {
@@ -57,7 +57,7 @@ impl Decode for Credential {
             let privkey = PrivateKeyData::decode_as(reader, algorithm.clone())?;
             let comment = String::decode(reader)?;
 
-            Ok(Credential::Cert {
+            Ok(PrivateCredential::Cert {
                 algorithm,
                 certificate,
                 privkey,
@@ -67,12 +67,12 @@ impl Decode for Credential {
             let algorithm = Algorithm::from_str(&alg).map_err(ssh_encoding::Error::from)?;
             let privkey = KeypairData::decode_as(reader, algorithm)?;
             let comment = String::decode(reader)?;
-            Ok(Credential::Key { privkey, comment })
+            Ok(PrivateCredential::Key { privkey, comment })
         }
     }
 }
 
-impl Encode for Credential {
+impl Encode for PrivateCredential {
     fn encoded_len(&self) -> ssh_encoding::Result<usize> {
         match self {
             Self::Key { privkey, comment } => {

tests/roundtrip/expected/req_add_identity_constrained_extension_restrict_destination.rs

@@ -1,13 +1,16 @@
 use hex_literal::hex;
-use ssh_agent_lib::proto::{AddIdentity, AddIdentityConstrained, Credential, Extension, KeyConstraint, Request, Unparsed};
+use ssh_agent_lib::proto::{
+    AddIdentity, AddIdentityConstrained, Extension, KeyConstraint, PrivateCredential, Request,
+    Unparsed,
+};
 use ssh_key::private::KeypairData;
 
 use super::fixtures;
 
 pub fn expected() -> Request {
     Request::AddIdConstrained(AddIdentityConstrained {
         identity: AddIdentity {
-            credential: Credential::Key {
+            credential: PrivateCredential::Key {
                 privkey: KeypairData::Ecdsa(fixtures::demo_key()),
                 comment: "baloo@angela".to_string(),
             },

tests/roundtrip/expected/req_add_identity_constrained_lifetime.rs

@@ -1,12 +1,14 @@
-use ssh_agent_lib::proto::{AddIdentity, AddIdentityConstrained, Credential, KeyConstraint, Request};
+use ssh_agent_lib::proto::{
+    AddIdentity, AddIdentityConstrained, KeyConstraint, PrivateCredential, Request,
+};
 use ssh_key::private::KeypairData;
 
 use super::fixtures;
 
 pub fn expected() -> Request {
     Request::AddIdConstrained(AddIdentityConstrained {
         identity: AddIdentity {
-            credential: Credential::Key {
+            credential: PrivateCredential::Key {
                 privkey: KeypairData::Ecdsa(fixtures::demo_key()),
                 comment: "baloo@angela".to_string(),
             },

tests/roundtrip/expected/req_add_identity_ecdsa.rs

@@ -1,13 +1,13 @@
-use ssh_agent_lib::proto::{AddIdentity, Credential, Request};
+use ssh_agent_lib::proto::{AddIdentity, PrivateCredential, Request};
 use ssh_key::private::KeypairData;
 
 use super::fixtures;
 
 pub fn expected() -> Request {
     Request::AddIdentity(AddIdentity {
-        credential: Credential::Key {
+        credential: PrivateCredential::Key {
             privkey: KeypairData::Ecdsa(fixtures::demo_key()),
             comment: "baloo@angela".to_string(),
-        }
+        },
     })
 }

tests/roundtrip/expected/req_parse_certificates.rs

@@ -1,15 +1,15 @@
 use hex_literal::hex;
-use ssh_agent_lib::proto::{AddIdentity, AddIdentityConstrained, Credential, KeyConstraint, PrivateKeyData, Request,};
-use ssh_key::{
-    private::RsaPrivateKey, Algorithm, Mpint
+use ssh_agent_lib::proto::{
+    AddIdentity, AddIdentityConstrained, KeyConstraint, PrivateCredential, PrivateKeyData, Request,
 };
+use ssh_key::{private::RsaPrivateKey, Algorithm, Mpint};
 
 use super::fixtures;
 
 pub fn expected() -> Request {
     Request::AddIdConstrained(AddIdentityConstrained {
         identity: AddIdentity {
-            credential: Credential::Cert {
+            credential: PrivateCredential::Cert {
                 algorithm: Algorithm::new("ssh-rsa").unwrap(),
                 certificate: fixtures::demo_certificate(),
                 privkey: PrivateKeyData::Rsa(RsaPrivateKey {