filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add support for PKCS8v1 ED25519 keys

Browse Source
This commit is contained in:
mdecimus
2023-07-28 10:18:27 +02:00
parent 9ff09c98ba
commit 66170bc177
2 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/smtp/src/config/auth.rs
View File

@@ -235,17 +235,20 @@ impl ConfigAuth for Config {
})?;
}
let key = Ed25519Key::from_seed_and_public_key(&private_key, &public_key)
let key = Ed25519Key::from_pkcs8_maybe_unchecked_der(&private_key)
.or_else(|_| {
Ed25519Key::from_seed_and_public_key(&private_key, &public_key)
})
.map_err(|err| {
format!("Failed to build ED25519 key for signature {id:?}: {err}")
})?;
let key_clone =
Ed25519Key::from_seed_and_public_key(&private_key, &public_key)
.map_err(|err| {
format!(
"Failed to build ED25519 key for signature {id:?}: {err}"
)
})?;
format!("Failed to build ED25519 key for signature {id:?}: {err}")
})?;
let key_clone = Ed25519Key::from_pkcs8_maybe_unchecked_der(&private_key)
.or_else(|_| {
Ed25519Key::from_seed_and_public_key(&private_key, &public_key)
})
.map_err(|err| {
format!("Failed to build ED25519 key for signature {id:?}: {err}")
})?;
let (signer, sealer) = parse_signature(self, id, key_clone, key)?;
(