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

Refactor determine_rsa_attrs() to be more easily reusable for key generation.

Browse source
This commit is contained in:
Heiko Schaefer 2021-12-02 13:13:28 +01:00
parent 9739074b63
commit 10bdb32c45
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
openpgp-card/src/keys.rs
View file

@ -187,8 +187,12 @@ pub(crate) fn key_import(
let (algo, key_cmd) = match key.private_key()? { let (algo, key_cmd) = match key.private_key()? {
PrivateKeyMaterial::R(rsa_key) => { PrivateKeyMaterial::R(rsa_key) => {
// RSA bitsize
// (round up to 4-bytes, in case the key has 8+ leading zero bits)
let rsa_bits = (((rsa_key.n().len() * 8 + 31) / 32) * 32) as u16;
let rsa_attrs = let rsa_attrs =
determine_rsa_attrs(&ard, &*rsa_key, key_type, algo_list)?; determine_rsa_attrs(rsa_bits, key_type, &ard, algo_list)?;
let key_cmd = rsa_key_import_cmd(key_type, rsa_key, &rsa_attrs)?; let key_cmd = rsa_key_import_cmd(key_type, rsa_key, &rsa_attrs)?;
@ -221,21 +225,17 @@ pub(crate) fn key_import(
Ok(()) Ok(())
} }
/// Derive RsaAttrs for `rsa_key`. /// Determine RsaAttrs for the current card, for an `rsa_bits` sized key.
/// ///
/// If available, via lookup in `algo_list`, otherwise the current /// If available, via lookup in `algo_list`, otherwise the current
/// algorithm attributes are loaded and checked. If neither method yields a /// algorithm attributes are checked. If neither method yields a
/// result, we 'guess' the RsaAttrs setting. /// result, we 'guess' the RsaAttrs setting.
fn determine_rsa_attrs( fn determine_rsa_attrs(
ard: &ApplicationRelatedData, rsa_bits: u16,
rsa_key: &dyn RSAKey,
key_type: KeyType, key_type: KeyType,
ard: &ApplicationRelatedData,
algo_list: Option<AlgoInfo>, algo_list: Option<AlgoInfo>,
) -> Result<RsaAttrs> { ) -> Result<RsaAttrs> {
// RSA bitsize
// (round up to 4-bytes, in case the key has 8+ leading zeros)
let rsa_bits = (((rsa_key.n().len() * 8 + 31) / 32) * 32) as u16;
// Figure out suitable RSA algorithm parameters: // Figure out suitable RSA algorithm parameters:
// Does the card offer a list of algorithms? // Does the card offer a list of algorithms?