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

In generate_key_simple(), the algo parameter is now an Option<AlgoSimple>.

Browse source 
This allows uploading keys without explicitly setting the algorithm, thus leaving the card's algo setting unchanged.
This commit is contained in:
Heiko Schaefer 2021-11-03 02:21:44 +01:00
parent 02401d12f4
commit 79cfcb09c2
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
openpgp-card-sequoia/src/card.rs
View file

@ -408,12 +408,19 @@ impl Admin<'_, '_> {
pub fn generate_key_simple( pub fn generate_key_simple(
&mut self, &mut self,
key_type: KeyType, key_type: KeyType,
algo: AlgoSimple, algo: Option<AlgoSimple>,
) -> Result<(PublicKeyMaterial, KeyGenerationTime), Error> { ) -> Result<(PublicKeyMaterial, KeyGenerationTime), Error> {
self.oc.card_app.generate_key_simple( match algo {
public_to_fingerprint, Some(algo) => self.oc.card_app.generate_key_simple(
key_type, public_to_fingerprint,
algo, key_type,
) algo,
),
None => self.oc.card_app.generate_key(
public_to_fingerprint,
key_type,
None,
),
}
} }
} }