danog/tergent
1
0
Fork 0
mirror of https://github.com/danog/tergent.git synced 2024-12-02 09:27:57 +01:00
Code Issues Projects Releases Wiki Activity

Remove redundant code for key name building

Browse Source
This commit is contained in:
Kaan Karaagacli 2018-10-06 18:13:13 -07:00
parent 489593eb7a
commit 38bded3682
No known key found for this signature in database
GPG Key ID: AC5AC44C642C454C
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/sign/request.rs
View File

@ -24,51 +24,37 @@ impl<'a> SignRequest<'a> {
&self.data &self.data
} }
// TODO: these two functions below are too similiar... /// Returns the tuple of keystore name and ssh name for this key.
fn name(&self) -> (&'static str, &'static str) {
/// Returns the name to be used when communicating with the
/// Android keystore.
pub fn keystore_name(&self) -> &'static str {
// TODO: handle invalid flags gracefully // TODO: handle invalid flags gracefully
match self.key.algorithm { match self.key.algorithm {
Algorithm::Rsa => { Algorithm::Rsa => {
match self.flags { match self.flags {
0 => "SHA1withRSA", 0 => ("SHA1withRSA", "ssh-rsa"),
SSH_AGENT_RSA_SHA2_256 => "SHA256withRSA", SSH_AGENT_RSA_SHA2_256 => ("SHA256withRSA", "rsa-sha2-256"),
SSH_AGENT_RSA_SHA2_512 => "SHA512withRSA", SSH_AGENT_RSA_SHA2_512 => ("SHA512withRSA", "rsa-sha2-512"),
f => panic!("Unknown flag {}", f), f => panic!("Unknown flag {}", f),
} }
}, },
Algorithm::Ec(ref curve) => { Algorithm::Ec(ref curve) => {
match curve { match curve {
Curve::P256 => "SHA256withECDSA", Curve::P256 => ("SHA256withECDSA", "ecdsa-sha2-nistp256"),
Curve::P384 => "SHA386withECDSA", Curve::P384 => ("SHA386withECDSA", "ecdsa-sha2-nistp384"),
Curve::P521 => "SHA512withECDSA", Curve::P521 => ("SHA512withECDSA", "ecdsa-sha2-nistp521"),
} }
}, },
} }
} }
/// Returns the name to be used when communicating with the
/// Android keystore.
pub fn keystore_name(&self) -> &'static str {
self.name().0
}
/// Returns the name to be used when communicating with an /// Returns the name to be used when communicating with an
/// ssh-agent client. /// ssh-agent client.
pub fn ssh_name(&self) -> &'static str { pub fn ssh_name(&self) -> &'static str {
// TODO: handle invalid flags gracefully self.name().1
match self.key.algorithm {
Algorithm::Rsa => {
match self.flags {
0 => "ssh-rsa",
SSH_AGENT_RSA_SHA2_256 => "rsa-sha2-256",
SSH_AGENT_RSA_SHA2_512 => "rsa-sha2-512",
f => panic!("Unknown flag {}", f),
}
},
Algorithm::Ec(ref curve) => {
match curve {
Curve::P256 => "ecdsa-sha2-nistp256",
Curve::P384 => "ecdsa-sha2-nistp384",
Curve::P521 => "ecdsa-sha2-nistp521",
}
},
}
} }
} }