diff options
author | Asher Gomez <ashersaupingomez@gmail.com> | 2024-09-11 07:55:42 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-10 21:55:42 +0000 |
commit | ace1202227abeeac78db0266a13b451c1792a6ce (patch) | |
tree | 3319bc3defab8dddc04e3907b7b7bece821fe094 /ext/net/ops_tls.rs | |
parent | be0ba6d84f190f4fc1b4517e62d9d8ad30c8cfb1 (diff) |
BREAKING(net): remove `Deno.ConnectTlsOptions.{certChain,certFile,privateKey}` and `Deno.ListenTlsOptions.certChain,certFile,keyFile}` (#25525)
Towards #22079
Diffstat (limited to 'ext/net/ops_tls.rs')
-rw-r--r-- | ext/net/ops_tls.rs | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs index 8483e7e66..3ca5adbbe 100644 --- a/ext/net/ops_tls.rs +++ b/ext/net/ops_tls.rs @@ -34,8 +34,6 @@ use deno_tls::new_resolver; use deno_tls::rustls::pki_types::ServerName; use deno_tls::rustls::ClientConnection; use deno_tls::rustls::ServerConfig; -use deno_tls::webpki::types::CertificateDer; -use deno_tls::webpki::types::PrivateKeyDer; use deno_tls::ServerConfigProvider; use deno_tls::SocketUse; use deno_tls::TlsKey; @@ -213,32 +211,6 @@ pub fn op_tls_key_static( Ok(TlsKeysHolder::from(TlsKeys::Static(TlsKey(cert, key)))) } -/// Legacy op -- will be removed in Deno 2.0. -#[op2] -#[cppgc] -pub fn op_tls_key_static_from_file<NP>( - state: &mut OpState, - #[string] api: String, - #[string] cert_file: String, - #[string] key_file: String, -) -> Result<TlsKeysHolder, AnyError> -where - NP: NetPermissions + 'static, -{ - { - let permissions = state.borrow_mut::<NP>(); - permissions.check_read(Path::new(&cert_file), &api)?; - permissions.check_read(Path::new(&key_file), &api)?; - } - - let cert = load_certs_from_file(&cert_file)?; - let key = load_private_keys_from_file(&key_file)? - .into_iter() - .next() - .unwrap(); - Ok(TlsKeysHolder::from(TlsKeys::Static(TlsKey(cert, key)))) -} - #[op2] pub fn op_tls_cert_resolver_create<'s>( scope: &mut v8::HandleScope<'s>, @@ -455,21 +427,6 @@ where Ok((rid, IpAddr::from(local_addr), IpAddr::from(remote_addr))) } -fn load_certs_from_file( - path: &str, -) -> Result<Vec<CertificateDer<'static>>, AnyError> { - let cert_file = File::open(path)?; - let reader = &mut BufReader::new(cert_file); - load_certs(reader) -} - -fn load_private_keys_from_file( - path: &str, -) -> Result<Vec<PrivateKeyDer<'static>>, AnyError> { - let key_bytes = std::fs::read(path)?; - load_private_keys(&key_bytes) -} - #[derive(Deserialize)] #[serde(rename_all = "camelCase")] pub struct ListenTlsArgs { |