diff options
author | Divy Srivastava <dj.srivastava23@gmail.com> | 2024-06-21 10:49:39 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-21 10:49:39 +0530 |
commit | b4939f33795b42f4a6bb47a803a9c83b531454a4 (patch) | |
tree | c666a9daef5cdfc05644a233910f60f9ecd98634 /ext/net | |
parent | 88e3f465d3a95db277ac7e685a0ed239958f8e6e (diff) |
fix: upgrade deno_core to 0.291.0 (#24297)
Diffstat (limited to 'ext/net')
-rw-r--r-- | ext/net/ops_tls.rs | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs index c52985908..adfa8224c 100644 --- a/ext/net/ops_tls.rs +++ b/ext/net/ops_tls.rs @@ -195,41 +195,34 @@ pub struct StartTlsArgs { } #[op2] -pub fn op_tls_key_null<'s>( - scope: &mut v8::HandleScope<'s>, -) -> Result<v8::Local<'s, v8::Object>, AnyError> { - Ok(deno_core::cppgc::make_cppgc_object( - scope, - TlsKeysHolder::from(TlsKeys::Null), - )) +#[cppgc] +pub fn op_tls_key_null() -> TlsKeysHolder { + TlsKeysHolder::from(TlsKeys::Null) } #[op2] -pub fn op_tls_key_static<'s>( - scope: &mut v8::HandleScope<'s>, - #[string] cert: String, - #[string] key: String, -) -> Result<v8::Local<'s, v8::Object>, AnyError> { +#[cppgc] +pub fn op_tls_key_static( + #[string] cert: &str, + #[string] key: &str, +) -> Result<TlsKeysHolder, AnyError> { let cert = load_certs(&mut BufReader::new(cert.as_bytes()))?; let key = load_private_keys(key.as_bytes())? .into_iter() .next() .unwrap(); - Ok(deno_core::cppgc::make_cppgc_object( - scope, - TlsKeysHolder::from(TlsKeys::Static(TlsKey(cert, key))), - )) + Ok(TlsKeysHolder::from(TlsKeys::Static(TlsKey(cert, key)))) } /// Legacy op -- will be removed in Deno 2.0. #[op2] -pub fn op_tls_key_static_from_file<'s, NP>( +#[cppgc] +pub fn op_tls_key_static_from_file<NP>( state: &mut OpState, - scope: &mut v8::HandleScope<'s>, #[string] api: String, #[string] cert_file: String, #[string] key_file: String, -) -> Result<v8::Local<'s, v8::Object>, AnyError> +) -> Result<TlsKeysHolder, AnyError> where NP: NetPermissions + 'static, { @@ -244,10 +237,7 @@ where .into_iter() .next() .unwrap(); - Ok(deno_core::cppgc::make_cppgc_object( - scope, - TlsKeysHolder::from(TlsKeys::Static(TlsKey(cert, key))), - )) + Ok(TlsKeysHolder::from(TlsKeys::Static(TlsKey(cert, key)))) } #[op2] |