diff options
author | Divy Srivastava <dj.srivastava23@gmail.com> | 2024-01-27 12:27:41 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-27 12:27:41 +0530 |
commit | d9191db0ce50b62cf54de9046d8c504599e30ae0 (patch) | |
tree | 6a734e1c582efc700f92d890e449f5233e1a1bc2 /ext/node/ops/crypto/x509.rs | |
parent | 462ce14a78b4109143918878042b9f552083c82e (diff) |
chore: upgrade deno_core to 0.256.0 (#22145)
Diffstat (limited to 'ext/node/ops/crypto/x509.rs')
-rw-r--r-- | ext/node/ops/crypto/x509.rs | 49 |
1 files changed, 12 insertions, 37 deletions
diff --git a/ext/node/ops/crypto/x509.rs b/ext/node/ops/crypto/x509.rs index 2e0aec011..eefe1c6d0 100644 --- a/ext/node/ops/crypto/x509.rs +++ b/ext/node/ops/crypto/x509.rs @@ -1,6 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -use deno_core::error::bad_resource_id; use deno_core::error::AnyError; use deno_core::op2; use deno_core::v8; @@ -14,7 +13,7 @@ use x509_parser::prelude::*; use digest::Digest; -struct Certificate { +pub(crate) struct Certificate { _buf: Vec<u8>, pem: Option<pem::Pem>, cert: X509Certificate<'static>, @@ -73,20 +72,15 @@ pub fn op_node_x509_parse<'s>( } #[op2(fast)] -pub fn op_node_x509_ca(rid: v8::Local<v8::Object>) -> Result<bool, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; +pub fn op_node_x509_ca(#[cppgc] cert: &Certificate) -> Result<bool, AnyError> { Ok(cert.is_ca()) } #[op2(fast)] pub fn op_node_x509_check_email( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, #[string] email: &str, ) -> Result<bool, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; - let subject = cert.subject(); if subject .iter_email() @@ -120,50 +114,40 @@ pub fn op_node_x509_check_email( #[op2] #[string] pub fn op_node_x509_fingerprint( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<Option<String>, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; Ok(cert.fingerprint::<sha1::Sha1>()) } #[op2] #[string] pub fn op_node_x509_fingerprint256( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<Option<String>, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; Ok(cert.fingerprint::<sha2::Sha256>()) } #[op2] #[string] pub fn op_node_x509_fingerprint512( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<Option<String>, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; Ok(cert.fingerprint::<sha2::Sha512>()) } #[op2] #[string] pub fn op_node_x509_get_issuer( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<String, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; Ok(x509name_to_string(cert.issuer(), oid_registry())?) } #[op2] #[string] pub fn op_node_x509_get_subject( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<String, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; Ok(x509name_to_string(cert.subject(), oid_registry())?) } @@ -230,30 +214,24 @@ fn x509name_to_string( #[op2] #[string] pub fn op_node_x509_get_valid_from( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<String, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; Ok(cert.validity().not_before.to_string()) } #[op2] #[string] pub fn op_node_x509_get_valid_to( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<String, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; Ok(cert.validity().not_after.to_string()) } #[op2] #[string] pub fn op_node_x509_get_serial_number( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<String, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; let mut s = cert.serial.to_str_radix(16); s.make_ascii_uppercase(); Ok(s) @@ -261,11 +239,8 @@ pub fn op_node_x509_get_serial_number( #[op2(fast)] pub fn op_node_x509_key_usage( - rid: v8::Local<v8::Object>, + #[cppgc] cert: &Certificate, ) -> Result<u16, AnyError> { - let cert = deno_core::cppgc::unwrap_cppgc_object::<Certificate>(rid) - .ok_or_else(bad_resource_id)?; - let key_usage = cert .extensions() .iter() |