hatter/proxy-inspector
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: v0.2.0-rc, optimize code

Browse Source
This commit is contained in:
Hatter Jiang
2024-03-30 19:27:25 +08:00
parent 2072412a5f
commit d8502a38ae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cert.rs
View File

@@ -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<Cert, String> { pub fn issue_certificate(issuer_certificate: &Certificate, domain: &str) -> Result<Cert, String> {
let cert = new_end_entity(domain)?; let cert = build_certificate(domain)?;
log::info!("New certificate for: {} -> {}", domain, hex::encode(cert.get_key_identifier())); log::info!("New certificate for: {} -> {}", domain, hex::encode(cert.get_key_identifier()));
let cert_pem = cert.serialize_pem_with_signer(issuer_certificate) let cert_pem = cert.serialize_pem_with_signer(issuer_certificate)
@@ -59,7 +59,7 @@ fn parse_pkcs8(pem: &str) -> String {
pem.to_string() pem.to_string()
} }
fn new_end_entity(domain: &str) -> Result<Certificate, String> { fn build_certificate(domain: &str) -> Result<Certificate, String> {
let mut params = CertificateParams::new(vec![domain.into()]); let mut params = CertificateParams::new(vec![domain.into()]);
let (start, end) = validity_period()?; let (start, end) = validity_period()?;
params.distinguished_name.push(DnType::CommonName, domain); params.distinguished_name.push(DnType::CommonName, domain);
@@ -75,8 +75,8 @@ fn new_end_entity(domain: &str) -> Result<Certificate, String> {
fn validity_period() -> Result<(OffsetDateTime, OffsetDateTime), String> { fn validity_period() -> Result<(OffsetDateTime, OffsetDateTime), String> {
let start = OffsetDateTime::now_utc().checked_sub(Duration::hours(1)) let start = OffsetDateTime::now_utc().checked_sub(Duration::hours(1))
.expect("SHOULD NOT HAPPEN!"); .ok_or::<String>("Generate start datetime failed.".into())?;
let end = OffsetDateTime::now_utc().checked_add(Duration::days(90)) let end = OffsetDateTime::now_utc().checked_add(Duration::days(90))
.expect("SHOULD NOT HAPPEN!"); .ok_or::<String>("Generate start datetime failed.".into())?;
Ok((start, end)) Ok((start, end))
} }