mirror/lldap
1
0
Fork 0
mirror of https://github.com/nitnelave/lldap.git synced 2023-04-12 14:25:13 +00:00
Code Issues Projects Releases Wiki Activity

server: add support for ec private keys

Browse Source
This commit is contained in:
Michał Mrozek 2023-04-11 10:57:25 +02:00 committed by GitHub
parent 5b74852193
commit 558bb37354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/infra/ldap_server.rs
View File

@ -94,7 +94,7 @@ where
} }
fn read_private_key(key_file: &str) -> Result<PrivateKey> { fn read_private_key(key_file: &str) -> Result<PrivateKey> {
use rustls_pemfile::{pkcs8_private_keys, rsa_private_keys}; use rustls_pemfile::{ec_private_keys, pkcs8_private_keys, rsa_private_keys};
use std::{fs::File, io::BufReader}; use std::{fs::File, io::BufReader};
pkcs8_private_keys(&mut BufReader::new(File::open(key_file)?)) pkcs8_private_keys(&mut BufReader::new(File::open(key_file)?))
.map_err(anyhow::Error::from) .map_err(anyhow::Error::from)
@ -112,9 +112,14 @@ fn read_private_key(key_file: &str) -> Result<PrivateKey> {
.ok_or_else(|| anyhow!("No PKCS1 key")) .ok_or_else(|| anyhow!("No PKCS1 key"))
}) })
}) })
.or_else(|_| {
ec_private_keys(&mut BufReader::new(File::open(key_file)?))
.map_err(anyhow::Error::from)
.and_then(|keys| keys.into_iter().next().ok_or_else(|| anyhow!("No EC key")))
})
.with_context(|| { .with_context(|| {
format!( format!(
"Cannot read either PKCS1 or PKCS8 private key from {}", "Cannot read either PKCS1, PKCS8 or EC private key from {}",
key_file key_file
) )
}) })