instant-labs
/
instant-acme
mirror of https://github.com/instant-labs/instant-acme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deduplicate Key constructor code

This commit is contained in:
Dirkjan Ochtman 2024-07-16 10:17:34 +02:00
parent 257a958a0a
commit 8e7871cbba
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib.rs
View File

@ -552,25 +552,16 @@ impl Key {
let rng = crypto::SystemRandom::new();
let pkcs8 =
crypto::EcdsaKeyPair::generate_pkcs8(&crypto::ECDSA_P256_SHA256_FIXED_SIGNING, &rng)?;
let inner = crypto::p256_key_pair_from_pkcs8(pkcs8.as_ref(), &rng)?;
let thumb = BASE64_URL_SAFE_NO_PAD.encode(Jwk::thumb_sha256(&inner)?);
Ok((
Self {
rng,
signing_algorithm: SigningAlgorithm::Es256,
inner,
thumb,
},
pkcs8,
))
Self::new(pkcs8.as_ref(), rng).map(|key| (key, pkcs8))
}
fn from_pkcs8_der(pkcs8_der: &[u8]) -> Result<Self, Error> {
let rng = crypto::SystemRandom::new();
Self::new(pkcs8_der, crypto::SystemRandom::new())
}
fn new(pkcs8_der: &[u8], rng: crypto::SystemRandom) -> Result<Self, Error> {
let inner = crypto::p256_key_pair_from_pkcs8(pkcs8_der, &rng)?;
let thumb = BASE64_URL_SAFE_NO_PAD.encode(Jwk::thumb_sha256(&inner)?);
Ok(Self {
rng,
signing_algorithm: SigningAlgorithm::Es256,