summaryrefslogtreecommitdiff
path: root/ext/net/ops_tls.rs
diff options
context:
space:
mode:
authorAsher Gomez <ashersaupingomez@gmail.com>2024-02-19 01:30:58 +1100
committerGitHub <noreply@github.com>2024-02-18 07:30:58 -0700
commit9a43a2b4959be288034ef0c43f638542de2028b8 (patch)
treea1a54e374b3616b9d4ebf318d71fa5c0f5931c9f /ext/net/ops_tls.rs
parent3c7057d5832bae61de7f5001df85d2505d6aa9db (diff)
feat: `Deno.ConnectTlsOptions.{cert,key}` (#22274)
Towards #22197
Diffstat (limited to 'ext/net/ops_tls.rs')
-rw-r--r--ext/net/ops_tls.rs29
1 files changed, 14 insertions, 15 deletions
diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs
index d16bface4..b16dafa71 100644
--- a/ext/net/ops_tls.rs
+++ b/ext/net/ops_tls.rs
@@ -145,8 +145,8 @@ impl Resource for TlsStreamResource {
pub struct ConnectTlsArgs {
cert_file: Option<String>,
ca_certs: Vec<String>,
- cert_chain: Option<String>,
- private_key: Option<String>,
+ cert: Option<String>,
+ key: Option<String>,
alpn_protocols: Option<Vec<String>>,
}
@@ -297,24 +297,23 @@ where
let local_addr = tcp_stream.local_addr()?;
let remote_addr = tcp_stream.peer_addr()?;
- let cert_chain_and_key =
- if args.cert_chain.is_some() || args.private_key.is_some() {
- let cert_chain = args
- .cert_chain
- .ok_or_else(|| type_error("No certificate chain provided"))?;
- let private_key = args
- .private_key
- .ok_or_else(|| type_error("No private key provided"))?;
- Some((cert_chain, private_key))
- } else {
- None
- };
+ let cert_and_key = if args.cert.is_some() || args.key.is_some() {
+ let cert = args
+ .cert
+ .ok_or_else(|| type_error("No certificate chain provided"))?;
+ let key = args
+ .key
+ .ok_or_else(|| type_error("No private key provided"))?;
+ Some((cert, key))
+ } else {
+ None
+ };
let mut tls_config = create_client_config(
root_cert_store,
ca_certs,
unsafely_ignore_certificate_errors,
- cert_chain_and_key,
+ cert_and_key,
SocketUse::GeneralSsl,
)?;