From 2ee20b04bc46424517ad33789a24897a7de47d52 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Wed, 8 Mar 2023 17:09:36 +0530 Subject: [PATCH 1/3] use deno_native_certs crate --- Cargo.lock | 61 ++++++++-------------------------------------- cli/args/mod.rs | 2 +- ext/tls/Cargo.toml | 2 +- ext/tls/lib.rs | 2 +- 4 files changed, 13 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index adf3706b704f47..379b6821725d92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1225,6 +1225,15 @@ dependencies = [ "libloading", ] +[[package]] +name = "deno_native_certs" +version = "0.1.0" +dependencies = [ + "dlopen", + "dlopen_derive", + "rustls-pemfile", +] + [[package]] name = "deno_net" version = "0.83.0" @@ -1353,9 +1362,9 @@ name = "deno_tls" version = "0.78.0" dependencies = [ "deno_core", + "deno_native_certs", "once_cell", "rustls", - "rustls-native-certs", "rustls-pemfile", "serde", "webpki", @@ -3210,12 +3219,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - [[package]] name = "ordered-float" version = "2.10.0" @@ -3943,18 +3946,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pemfile" version = "1.0.2" @@ -4018,15 +4009,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -4069,29 +4051,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "0.9.0" diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 5f151d96983123..4aa0e50e2aba53 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -43,7 +43,7 @@ use deno_runtime::colors; use deno_runtime::deno_node::PackageJson; use deno_runtime::deno_tls::rustls; use deno_runtime::deno_tls::rustls::RootCertStore; -use deno_runtime::deno_tls::rustls_native_certs::load_native_certs; +use deno_runtime::deno_tls::deno_native_certs::load_native_certs; use deno_runtime::deno_tls::rustls_pemfile; use deno_runtime::deno_tls::webpki_roots; use deno_runtime::inspector_server::InspectorServer; diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml index e73a6e242f0a56..7bc1d171d4b485 100644 --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml @@ -17,7 +17,7 @@ path = "lib.rs" deno_core.workspace = true once_cell.workspace = true rustls = { workspace = true, features = ["dangerous_configuration"] } -rustls-native-certs = "0.6.2" +deno_native_certs = { version = "0.1.0", path = "../../../deno_native_certs" } rustls-pemfile.workspace = true serde.workspace = true webpki = "0.22" diff --git a/ext/tls/lib.rs b/ext/tls/lib.rs index b762ac90ad570b..21993cd20a387a 100644 --- a/ext/tls/lib.rs +++ b/ext/tls/lib.rs @@ -1,7 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. pub use rustls; -pub use rustls_native_certs; +pub use deno_native_certs; pub use rustls_pemfile; pub use webpki; pub use webpki_roots; From 5d42c62a531a395dfdedc5d65e60da042dcee4c9 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Wed, 8 Mar 2023 23:21:59 +0530 Subject: [PATCH 2/3] crate now on crates.io --- Cargo.lock | 53 ++++++++++++++++++++++++++++++++++++++++++++++ cli/args/mod.rs | 2 +- ext/tls/Cargo.toml | 2 +- ext/tls/lib.rs | 2 +- 4 files changed, 56 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 379b6821725d92..b703a33d5c5e09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1228,9 +1228,12 @@ dependencies = [ [[package]] name = "deno_native_certs" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "853d2dd52d7481caaf1eb6bea13739d0ddafd5453c655ffdbe8e9c57c60b18d4" dependencies = [ "dlopen", "dlopen_derive", + "rustls-native-certs", "rustls-pemfile", ] @@ -3219,6 +3222,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + [[package]] name = "ordered-float" version = "2.10.0" @@ -3946,6 +3955,18 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.2" @@ -4009,6 +4030,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -4051,6 +4081,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "security-framework" +version = "2.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "0.9.0" diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 4aa0e50e2aba53..51170759245368 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -41,9 +41,9 @@ use deno_core::serde_json; use deno_core::url::Url; use deno_runtime::colors; use deno_runtime::deno_node::PackageJson; +use deno_runtime::deno_tls::deno_native_certs::load_native_certs; use deno_runtime::deno_tls::rustls; use deno_runtime::deno_tls::rustls::RootCertStore; -use deno_runtime::deno_tls::deno_native_certs::load_native_certs; use deno_runtime::deno_tls::rustls_pemfile; use deno_runtime::deno_tls::webpki_roots; use deno_runtime::inspector_server::InspectorServer; diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml index 7bc1d171d4b485..5d3795a1574dce 100644 --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml @@ -15,9 +15,9 @@ path = "lib.rs" [dependencies] deno_core.workspace = true +deno_native_certs = "0.1.0" once_cell.workspace = true rustls = { workspace = true, features = ["dangerous_configuration"] } -deno_native_certs = { version = "0.1.0", path = "../../../deno_native_certs" } rustls-pemfile.workspace = true serde.workspace = true webpki = "0.22" diff --git a/ext/tls/lib.rs b/ext/tls/lib.rs index 21993cd20a387a..aff473a8625848 100644 --- a/ext/tls/lib.rs +++ b/ext/tls/lib.rs @@ -1,7 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -pub use rustls; pub use deno_native_certs; +pub use rustls; pub use rustls_pemfile; pub use webpki; pub use webpki_roots; From bad8c8e9e1989d054f3e4f99134477a5ad1f9cfe Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Thu, 9 Mar 2023 11:09:15 +0530 Subject: [PATCH 3/3] bump version --- Cargo.lock | 9 +++++---- Cargo.toml | 2 +- ext/tls/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b703a33d5c5e09..b33bd020b786f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1227,12 +1227,13 @@ dependencies = [ [[package]] name = "deno_native_certs" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853d2dd52d7481caaf1eb6bea13739d0ddafd5453c655ffdbe8e9c57c60b18d4" +checksum = "f9c7c5a7f03be0fccb523765d76aa6758760f3163459ce777ba3979596db0998" dependencies = [ "dlopen", "dlopen_derive", + "once_cell", "rustls-native-certs", "rustls-pemfile", ] @@ -3212,9 +3213,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" diff --git a/Cargo.toml b/Cargo.toml index 1fbdd5c657f554..6fae383cbca8ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,7 @@ libc = "0.2.126" log = "=0.4.17" lzzzz = "1.0" notify = "=5.0.0" -once_cell = "=1.16.0" +once_cell = "1.17.1" os_pipe = "=1.0.1" parking_lot = "0.12.0" percent-encoding = "=2.2.0" diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml index 5d3795a1574dce..6a1d2787589297 100644 --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml @@ -15,7 +15,7 @@ path = "lib.rs" [dependencies] deno_core.workspace = true -deno_native_certs = "0.1.0" +deno_native_certs = "0.1.1" once_cell.workspace = true rustls = { workspace = true, features = ["dangerous_configuration"] } rustls-pemfile.workspace = true