v0.28.1

src/tls/server_config.rs

@@ -310,16 +310,14 @@ fn certificate_public_metadata(certificate: &[u8]) -> Result<CertificateMetadata
 /// Used by the authenticated certificate inventory to enrich older/manual entries
 /// that predate persisted `covered_hosts` metadata. Private key material is not read.
 pub fn certificate_covered_hosts(directory: &Path, cert_file: &str) -> Result<Vec<String>> {
-    safe_name(cert_file)?;
-    let certificate = read_pem(&directory.join(cert_file), false)?;
+    let certificate = read_configured_pem(directory, cert_file, false)?;
     certificate_dns_names(&certificate)
 }
 
 /// Read non-secret metadata directly from the configured public leaf certificate.
 /// Private keys are never opened by this path.
 pub fn certificate_metadata(directory: &Path, cert_file: &str) -> Result<CertificateMetadata> {
-    safe_name(cert_file)?;
-    let certificate = read_pem(&directory.join(cert_file), false)?;
+    let certificate = read_configured_pem(directory, cert_file, false)?;
     certificate_public_metadata(&certificate)
 }
 
@@ -340,11 +338,10 @@ fn parse_pair(certificate: &[u8], key: &[u8]) -> Result<CertifiedKey> {
     Ok(certified)
 }
 fn load_pair(directory: &Path, cert: &str, key: &str) -> Result<CertifiedKey> {
-    safe_name(cert)?;
-    safe_name(key)?;
+    certificate_files_are_external(cert, key)?;
     parse_pair(
-        &read_pem(&directory.join(cert), false)?,
-        &read_pem(&directory.join(key), true)?,
+        &read_configured_pem(directory, cert, false)?,
+        &read_configured_pem(directory, key, true)?,
     )
 }
 /// Runs on a bounded control-plane blocking worker, never from a handshake.