From d8502a38aeb84d814edcc41f87df375bef2e8542 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sat, 30 Mar 2024 19:27:25 +0800 Subject: [PATCH] feat: v0.2.0-rc, optimize code --- src/cert.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cert.rs b/src/cert.rs index 591bb9c..50ddd5f 100644 --- a/src/cert.rs +++ b/src/cert.rs @@ -26,7 +26,7 @@ pub fn load_certificate(cert_fn: &str, key_fn: &str) -> Result<(Certificate, Str } pub fn issue_certificate(issuer_certificate: &Certificate, domain: &str) -> Result { - let cert = new_end_entity(domain)?; + let cert = build_certificate(domain)?; log::info!("New certificate for: {} -> {}", domain, hex::encode(cert.get_key_identifier())); let cert_pem = cert.serialize_pem_with_signer(issuer_certificate) @@ -59,7 +59,7 @@ fn parse_pkcs8(pem: &str) -> String { pem.to_string() } -fn new_end_entity(domain: &str) -> Result { +fn build_certificate(domain: &str) -> Result { let mut params = CertificateParams::new(vec![domain.into()]); let (start, end) = validity_period()?; params.distinguished_name.push(DnType::CommonName, domain); @@ -75,8 +75,8 @@ fn new_end_entity(domain: &str) -> Result { fn validity_period() -> Result<(OffsetDateTime, OffsetDateTime), String> { let start = OffsetDateTime::now_utc().checked_sub(Duration::hours(1)) - .expect("SHOULD NOT HAPPEN!"); + .ok_or::("Generate start datetime failed.".into())?; let end = OffsetDateTime::now_utc().checked_add(Duration::days(90)) - .expect("SHOULD NOT HAPPEN!"); + .ok_or::("Generate start datetime failed.".into())?; Ok((start, end)) }