turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up AlgoSimple::get_algo().

Browse source
This commit is contained in:
Heiko Schaefer 2021-08-28 11:57:04 +02:00
parent 139f3116f2
commit 889ac234c6
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
openpgp-card/src/algorithm.rs
View file

@ -58,14 +58,37 @@ impl From<&str> for AlgoSimple {
} }
impl AlgoSimple { impl AlgoSimple {
pub(crate) fn get_algo(&self, kt: KeyType) -> Algo { /// Get corresponding EccType by KeyType (except for Curve25519)
let et = match kt { fn get_ecc_type(key_type: KeyType) -> EccType {
match key_type {
KeyType::Signing KeyType::Signing
| KeyType::Authentication | KeyType::Authentication
| KeyType::Attestation => EccType::ECDSA, | KeyType::Attestation => EccType::ECDSA,
KeyType::Decryption => EccType::ECDH, KeyType::Decryption => EccType::ECDH,
}; }
}
/// Get corresponding EccType by KeyType for Curve25519
fn get_ecc_type_25519(key_type: KeyType) -> EccType {
match key_type {
KeyType::Signing
| KeyType::Authentication
| KeyType::Attestation => EccType::EdDSA,
KeyType::Decryption => EccType::ECDH,
}
}
/// Get corresponding Curve by KeyType for 25519 (Ed25519 vs Cv25519)
fn get_curve_for_25519(key_type: KeyType) -> Curve {
match key_type {
KeyType::Signing
| KeyType::Authentication
| KeyType::Attestation => Curve::Ed25519,
KeyType::Decryption => Curve::Cv25519,
}
}
pub(crate) fn get_algo(&self, key_type: KeyType) -> Algo {
match self { match self {
Self::RSA1k(e) => Algo::Rsa(RsaAttrs { Self::RSA1k(e) => Algo::Rsa(RsaAttrs {
len_n: 1024, len_n: 1024,
@ -89,32 +112,22 @@ impl AlgoSimple {
}), }),
Self::NIST256 => Algo::Ecc(EccAttrs { Self::NIST256 => Algo::Ecc(EccAttrs {
curve: Curve::NistP256r1, curve: Curve::NistP256r1,
ecc_type: et, ecc_type: Self::get_ecc_type(key_type),
import_format: None, import_format: None,
}), }),
Self::NIST384 => Algo::Ecc(EccAttrs { Self::NIST384 => Algo::Ecc(EccAttrs {
curve: Curve::NistP384r1, curve: Curve::NistP384r1,
ecc_type: et, ecc_type: Self::get_ecc_type(key_type),
import_format: None, import_format: None,
}), }),
Self::NIST521 => Algo::Ecc(EccAttrs { Self::NIST521 => Algo::Ecc(EccAttrs {
curve: Curve::NistP521r1, curve: Curve::NistP521r1,
ecc_type: et, ecc_type: Self::get_ecc_type(key_type),
import_format: None, import_format: None,
}), }),
Self::Curve25519 => Algo::Ecc(EccAttrs { Self::Curve25519 => Algo::Ecc(EccAttrs {
curve: match kt { curve: Self::get_curve_for_25519(key_type),
KeyType::Signing ecc_type: Self::get_ecc_type_25519(key_type),
| KeyType::Authentication
| KeyType::Attestation => Curve::Ed25519,
KeyType::Decryption => Curve::Cv25519,
},
ecc_type: match kt {
KeyType::Signing
| KeyType::Authentication
| KeyType::Attestation => EccType::EdDSA,
KeyType::Decryption => EccType::ECDH,
},
import_format: None, import_format: None,
}), }),
} }