Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
mmastrac committed Apr 25, 2024
1 parent d89f47e commit adae0c0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion cli/args/mod.rs
Expand Up @@ -9,7 +9,6 @@ pub mod package_json;

pub use self::import_map::resolve_import_map;
use self::package_json::PackageJsonDeps;
use deno_runtime::permissions::PermissionsOptions;
use ::import_map::ImportMap;
use deno_ast::SourceMapOption;
use deno_core::resolve_url_or_path;
Expand All @@ -18,6 +17,7 @@ use deno_npm::NpmSystemInfo;
use deno_runtime::deno_tls::create_default_root_cert_store;
use deno_runtime::deno_tls::create_platform_cert_store;
use deno_runtime::deno_tls::RootCertStoreProvider;
use deno_runtime::permissions::PermissionsOptions;
use deno_semver::npm::NpmPackageReqReference;
use indexmap::IndexMap;

Expand Down
18 changes: 6 additions & 12 deletions ext/tls/lib.rs
Expand Up @@ -20,13 +20,13 @@ use deno_core::anyhow::anyhow;
use deno_core::error::custom_error;
use deno_core::error::AnyError;

use rustls::ClientConfig;
use rustls::DigitallySignedStruct;
use rustls::Error;
use rustls::client::danger::HandshakeSignatureValid;
use rustls::client::danger::ServerCertVerified;
use rustls::client::danger::ServerCertVerifier;
use rustls::client::WebPkiServerVerifier;
use rustls::ClientConfig;
use rustls::DigitallySignedStruct;
use rustls::Error;
use rustls_pemfile::certs;
use rustls_pemfile::ec_private_keys;
use rustls_pemfile::pkcs8_private_keys;
Expand Down Expand Up @@ -328,9 +328,7 @@ fn cert_not_found_err() -> AnyError {
}

/// Starts with -----BEGIN RSA PRIVATE KEY-----
fn load_rsa_keys(
mut bytes: &[u8],
) -> Result<Vec<PrivateKey>, AnyError> {
fn load_rsa_keys(mut bytes: &[u8]) -> Result<Vec<PrivateKey>, AnyError> {
let keys = rsa_private_keys(&mut bytes).map_err(|_| key_decode_err())?;
Ok(
keys
Expand All @@ -341,9 +339,7 @@ fn load_rsa_keys(
}

/// Starts with -----BEGIN EC PRIVATE KEY-----
fn load_ec_keys(
mut bytes: &[u8],
) -> Result<Vec<PrivateKey>, AnyError> {
fn load_ec_keys(mut bytes: &[u8]) -> Result<Vec<PrivateKey>, AnyError> {
let keys = ec_private_keys(&mut bytes).map_err(|_| key_decode_err())?;
Ok(
keys
Expand All @@ -354,9 +350,7 @@ fn load_ec_keys(
}

/// Starts with -----BEGIN PRIVATE KEY-----
fn load_pkcs8_keys(
mut bytes: &[u8],
) -> Result<Vec<PrivateKey>, AnyError> {
fn load_pkcs8_keys(mut bytes: &[u8]) -> Result<Vec<PrivateKey>, AnyError> {
let keys = pkcs8_private_keys(&mut bytes).map_err(|_| key_decode_err())?;
Ok(
keys
Expand Down

0 comments on commit adae0c0

Please sign in to comment.