Skip to content

Commit 3de1b74

Browse files
authored
HELP-70689 Use openssl cert parsing when openssl-tls is enabled (#1302)
1 parent 7dc75b6 commit 3de1b74

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/runtime/tls_openssl.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,15 @@ fn make_openssl_connector(cfg: TlsOptions) -> Result<SslConnector> {
9898
#[cfg(feature = "cert-key-password")]
9999
if let Some(key_pw) = tls_certificate_key_file_password {
100100
let contents = std::fs::read(&path)?;
101+
102+
/*
101103
let key_bytes = super::pem::decrypt_private_key(&contents, &key_pw)?;
102104
let key =
103105
openssl::pkey::PKey::private_key_from_der(&key_bytes).map_err(openssl_err)?;
106+
*/
107+
108+
let key = openssl::pkey::PKey::private_key_from_pem_passphrase(&contents, &key_pw)
109+
.map_err(openssl_err)?;
104110
builder.set_private_key(&key).map_err(openssl_err)?;
105111
return Ok(());
106112
}

0 commit comments

Comments
 (0)