diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2021-12-06 18:48:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-07 00:48:11 +0100 |
commit | a2f1357fe81fe212451567cc433c0e6b4a85edc5 (patch) | |
tree | 1e4267d9f6e6bb3ddbdf030b4d6d1c547a33b6be /cli/standalone.rs | |
parent | b91e6fd02f61ea34881226bc4b202e38ed75123e (diff) |
chore: upgrade to rustls 0.20 (#12488)
Co-authored-by: Bartek IwaĆczuk <biwanczuk@gmail.com>
Co-authored-by: Bert Belder <bertbelder@gmail.com>
Diffstat (limited to 'cli/standalone.rs')
-rw-r--r-- | cli/standalone.rs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cli/standalone.rs b/cli/standalone.rs index 464ff2c2d..47b0e2aa8 100644 --- a/cli/standalone.rs +++ b/cli/standalone.rs @@ -22,6 +22,7 @@ use deno_core::ModuleLoader; use deno_core::ModuleSpecifier; use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel; use deno_runtime::deno_tls::create_default_root_cert_store; +use deno_runtime::deno_tls::rustls_pemfile; use deno_runtime::deno_web::BlobStore; use deno_runtime::permissions::Permissions; use deno_runtime::permissions::PermissionsOptions; @@ -221,9 +222,16 @@ pub async fn run( if let Some(cert) = metadata.ca_data { let reader = &mut BufReader::new(Cursor::new(cert)); - // This function does not return specific errors, if it fails give a generic message. - if let Err(_err) = root_cert_store.add_pem_file(reader) { - return Err(anyhow!("Unable to add pem file to certificate store")); + match rustls_pemfile::certs(reader) { + Ok(certs) => { + root_cert_store.add_parsable_certificates(&certs); + } + Err(e) => { + return Err(anyhow!( + "Unable to add pem file to certificate store: {}", + e + )); + } } } |