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:32:45 +08:00
parent 0ea3926238
commit ea29af39a7
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cert.rs
View File

@@ -13,10 +13,15 @@ pub struct Cert {
} }
pub fn load_certificate(cert_fn: &str, key_fn: &str) -> Result<(Certificate, String), String> { pub fn load_certificate(cert_fn: &str, key_fn: &str) -> Result<(Certificate, String), String> {
let cert_pem = fs::read_to_string(cert_fn).map_err(|e| format!("Read file: {} failed: {}", cert_fn, e))?; let cert_pem = fs::read_to_string(cert_fn)
let key_pem = fs::read_to_string(key_fn).map_err(|e| format!("Read file: {} failed: {}", key_fn, e))?; .map_err(|e| format!("Read file: {} failed: {}", cert_fn, e))?;
let key_pem = parse_pkcs8(&key_pem);
let key_pair = KeyPair::from_pem(&key_pem).map_err(|e| format!("Parse key: {} failed: {}", key_fn, e))?; let key_pem = fs::read_to_string(key_fn)
.map_err(|e| format!("Read file: {} failed: {}", key_fn, e))?;
let key_pem = resolve_ec_pkcs8(&key_pem);
let key_pair = KeyPair::from_pem(&key_pem)
.map_err(|e| format!("Parse key: {} failed: {}", key_fn, e))?;
// 底层逻辑限制，P256 与 SHA256 搭配，P384 与 SHA384 搭配 // 底层逻辑限制，P256 与 SHA256 搭配，P384 与 SHA384 搭配
let certificate_params = CertificateParams::from_ca_cert_pem(&cert_pem, key_pair) let certificate_params = CertificateParams::from_ca_cert_pem(&cert_pem, key_pair)
.map_err(|e| format!("Cert and keypair match failed: {}", e))?; .map_err(|e| format!("Cert and keypair match failed: {}", e))?;
@@ -51,7 +56,7 @@ macro_rules! ecc_private_key_convert {
}}; }};
} }
fn parse_pkcs8(pem: &str) -> String { fn resolve_ec_pkcs8(pem: &str) -> String {
// KeyPair only support PKCS#8 private key with public key, though public key is optional // KeyPair only support PKCS#8 private key with public key, though public key is optional
ecc_private_key_convert!(p256, pem); ecc_private_key_convert!(p256, pem);
ecc_private_key_convert!(p384, pem); ecc_private_key_convert!(p384, pem);