From 4bf93a9af0047e5a6e94acdbd3f97dd20fb1867f Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 15 Nov 2020 14:02:53 +1000 Subject: [PATCH] add native-tls in preparation for Linux-only ring --- cargo/Cargo.lock | 125 ++++++++++++--- cargo/crates.bzl | 130 +++++++++++---- cargo/licenses.json | 89 +++++++++-- ...azel => BUILD.core-foundation-0.9.1.bazel} | 4 +- ... => BUILD.core-foundation-sys-0.8.2.bazel} | 4 +- cargo/remote/BUILD.foreign-types-0.3.2.bazel | 53 +++++++ .../BUILD.foreign-types-shared-0.1.1.bazel | 52 ++++++ cargo/remote/BUILD.hyper-tls-0.4.3.bazel | 59 +++++++ cargo/remote/BUILD.native-tls-0.2.6.bazel | 150 ++++++++++++++++++ cargo/remote/BUILD.openssl-0.10.30.bazel | 89 +++++++++++ cargo/remote/BUILD.openssl-sys-0.9.58.bazel | 103 ++++++++++++ cargo/remote/BUILD.reqwest-0.10.8.bazel | 16 +- ...l => BUILD.security-framework-2.0.0.bazel} | 8 +- ... BUILD.security-framework-sys-2.0.0.bazel} | 5 +- ....4.0.bazel => BUILD.tokio-tls-0.3.1.bazel} | 30 ++-- cargo/remote/BUILD.webpki-roots-0.20.0.bazel | 78 +++++++++ rslib/Cargo.toml | 2 +- 17 files changed, 905 insertions(+), 92 deletions(-) rename cargo/remote/{BUILD.core-foundation-0.7.0.bazel => BUILD.core-foundation-0.9.1.bazel} (92%) rename cargo/remote/{BUILD.core-foundation-sys-0.7.0.bazel => BUILD.core-foundation-sys-0.8.2.bazel} (97%) create mode 100644 cargo/remote/BUILD.foreign-types-0.3.2.bazel create mode 100644 cargo/remote/BUILD.foreign-types-shared-0.1.1.bazel create mode 100644 cargo/remote/BUILD.hyper-tls-0.4.3.bazel create mode 100644 cargo/remote/BUILD.native-tls-0.2.6.bazel create mode 100644 cargo/remote/BUILD.openssl-0.10.30.bazel create mode 100644 cargo/remote/BUILD.openssl-sys-0.9.58.bazel rename cargo/remote/{BUILD.security-framework-1.0.0.bazel => BUILD.security-framework-2.0.0.bazel} (86%) rename cargo/remote/{BUILD.security-framework-sys-1.0.0.bazel => BUILD.security-framework-sys-2.0.0.bazel} (90%) rename cargo/remote/{BUILD.rustls-native-certs-0.4.0.bazel => BUILD.tokio-tls-0.3.1.bazel} (74%) create mode 100644 cargo/remote/BUILD.webpki-roots-0.20.0.bazel diff --git a/cargo/Cargo.lock b/cargo/Cargo.lock index a86d70c1d..c54246541 100644 --- a/cargo/Cargo.lock +++ b/cargo/Cargo.lock @@ -285,9 +285,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" -version = "0.7.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" dependencies = [ "core-foundation-sys", "libc", @@ -295,9 +295,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" [[package]] name = "crc32fast" @@ -577,6 +577,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.0.0" @@ -909,6 +924,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-tls" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +dependencies = [ + "bytes 0.5.6", + "hyper", + "native-tls", + "tokio", + "tokio-tls", +] + [[package]] name = "idna" version = "0.2.0" @@ -1188,6 +1216,24 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" +[[package]] +name = "native-tls" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "net2" version = "0.2.35" @@ -1289,12 +1335,39 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +[[package]] +name = "openssl" +version = "0.10.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +dependencies = [ + "bitflags", + "cfg-if 0.1.10", + "foreign-types", + "lazy_static", + "libc", + "openssl-sys", +] + [[package]] name = "openssl-probe" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +[[package]] +name = "openssl-sys" +version = "0.9.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "parking_lot" version = "0.11.0" @@ -1668,26 +1741,29 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-timeout", + "hyper-tls", "ipnet", "js-sys", "lazy_static", "log", "mime", "mime_guess", + "native-tls", "percent-encoding", "pin-project-lite", "rustls", - "rustls-native-certs", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-rustls", "tokio-socks", + "tokio-tls", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "winreg", ] @@ -1752,18 +1828,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls-native-certs" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8" -dependencies = [ - "openssl-probe", - "rustls", - "schannel", - "security-framework", -] - [[package]] name = "ryu" version = "1.0.5" @@ -1798,9 +1862,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" +checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" dependencies = [ "bitflags", "core-foundation", @@ -1811,9 +1875,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" +checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" dependencies = [ "core-foundation-sys", "libc", @@ -2203,6 +2267,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +dependencies = [ + "native-tls", + "tokio", +] + [[package]] name = "tokio-util" version = "0.3.1" @@ -2522,6 +2596,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki-roots" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" +dependencies = [ + "webpki", +] + [[package]] name = "which" version = "4.0.2" diff --git a/cargo/crates.bzl b/cargo/crates.bzl index 74a2d218a..3d5abd444 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -343,22 +343,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__core_foundation__0_7_0", - url = "https://crates.io/api/v1/crates/core-foundation/0.7.0/download", + name = "raze__core_foundation__0_9_1", + url = "https://crates.io/api/v1/crates/core-foundation/0.9.1/download", type = "tar.gz", - sha256 = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171", - strip_prefix = "core-foundation-0.7.0", - build_file = Label("//cargo/remote:BUILD.core-foundation-0.7.0.bazel"), + sha256 = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62", + strip_prefix = "core-foundation-0.9.1", + build_file = Label("//cargo/remote:BUILD.core-foundation-0.9.1.bazel"), ) maybe( http_archive, - name = "raze__core_foundation_sys__0_7_0", - url = "https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download", + name = "raze__core_foundation_sys__0_8_2", + url = "https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download", type = "tar.gz", - sha256 = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac", - strip_prefix = "core-foundation-sys-0.7.0", - build_file = Label("//cargo/remote:BUILD.core-foundation-sys-0.7.0.bazel"), + sha256 = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b", + strip_prefix = "core-foundation-sys-0.8.2", + build_file = Label("//cargo/remote:BUILD.core-foundation-sys-0.8.2.bazel"), ) maybe( @@ -601,6 +601,26 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.fnv-1.0.7.bazel"), ) + maybe( + http_archive, + name = "raze__foreign_types__0_3_2", + url = "https://crates.io/api/v1/crates/foreign-types/0.3.2/download", + type = "tar.gz", + sha256 = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1", + strip_prefix = "foreign-types-0.3.2", + build_file = Label("//cargo/remote:BUILD.foreign-types-0.3.2.bazel"), + ) + + maybe( + http_archive, + name = "raze__foreign_types_shared__0_1_1", + url = "https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download", + type = "tar.gz", + sha256 = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b", + strip_prefix = "foreign-types-shared-0.1.1", + build_file = Label("//cargo/remote:BUILD.foreign-types-shared-0.1.1.bazel"), + ) + maybe( http_archive, name = "raze__form_urlencoded__1_0_0", @@ -931,6 +951,16 @@ def raze_fetch_remote_crates(): init_submodules = True, ) + maybe( + http_archive, + name = "raze__hyper_tls__0_4_3", + url = "https://crates.io/api/v1/crates/hyper-tls/0.4.3/download", + type = "tar.gz", + sha256 = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed", + strip_prefix = "hyper-tls-0.4.3", + build_file = Label("//cargo/remote:BUILD.hyper-tls-0.4.3.bazel"), + ) + maybe( http_archive, name = "raze__idna__0_2_0", @@ -1231,6 +1261,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.multimap-0.8.2.bazel"), ) + maybe( + http_archive, + name = "raze__native_tls__0_2_6", + url = "https://crates.io/api/v1/crates/native-tls/0.2.6/download", + type = "tar.gz", + sha256 = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f", + strip_prefix = "native-tls-0.2.6", + build_file = Label("//cargo/remote:BUILD.native-tls-0.2.6.bazel"), + ) + maybe( http_archive, name = "raze__net2__0_2_35", @@ -1341,6 +1381,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.once_cell-1.5.2.bazel"), ) + maybe( + http_archive, + name = "raze__openssl__0_10_30", + url = "https://crates.io/api/v1/crates/openssl/0.10.30/download", + type = "tar.gz", + sha256 = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4", + strip_prefix = "openssl-0.10.30", + build_file = Label("//cargo/remote:BUILD.openssl-0.10.30.bazel"), + ) + maybe( http_archive, name = "raze__openssl_probe__0_1_2", @@ -1351,6 +1401,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.openssl-probe-0.1.2.bazel"), ) + maybe( + http_archive, + name = "raze__openssl_sys__0_9_58", + url = "https://crates.io/api/v1/crates/openssl-sys/0.9.58/download", + type = "tar.gz", + sha256 = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de", + strip_prefix = "openssl-sys-0.9.58", + build_file = Label("//cargo/remote:BUILD.openssl-sys-0.9.58.bazel"), + ) + maybe( http_archive, name = "raze__parking_lot__0_11_0", @@ -1791,16 +1851,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.rustls-0.18.1.bazel"), ) - maybe( - http_archive, - name = "raze__rustls_native_certs__0_4_0", - url = "https://crates.io/api/v1/crates/rustls-native-certs/0.4.0/download", - type = "tar.gz", - sha256 = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8", - strip_prefix = "rustls-native-certs-0.4.0", - build_file = Label("//cargo/remote:BUILD.rustls-native-certs-0.4.0.bazel"), - ) - maybe( http_archive, name = "raze__ryu__1_0_5", @@ -1843,22 +1893,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__security_framework__1_0_0", - url = "https://crates.io/api/v1/crates/security-framework/1.0.0/download", + name = "raze__security_framework__2_0_0", + url = "https://crates.io/api/v1/crates/security-framework/2.0.0/download", type = "tar.gz", - sha256 = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b", - strip_prefix = "security-framework-1.0.0", - build_file = Label("//cargo/remote:BUILD.security-framework-1.0.0.bazel"), + sha256 = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69", + strip_prefix = "security-framework-2.0.0", + build_file = Label("//cargo/remote:BUILD.security-framework-2.0.0.bazel"), ) maybe( http_archive, - name = "raze__security_framework_sys__1_0_0", - url = "https://crates.io/api/v1/crates/security-framework-sys/1.0.0/download", + name = "raze__security_framework_sys__2_0_0", + url = "https://crates.io/api/v1/crates/security-framework-sys/2.0.0/download", type = "tar.gz", - sha256 = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7", - strip_prefix = "security-framework-sys-1.0.0", - build_file = Label("//cargo/remote:BUILD.security-framework-sys-1.0.0.bazel"), + sha256 = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b", + strip_prefix = "security-framework-sys-2.0.0", + build_file = Label("//cargo/remote:BUILD.security-framework-sys-2.0.0.bazel"), ) maybe( @@ -2251,6 +2301,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.tokio-socks-0.3.0.bazel"), ) + maybe( + http_archive, + name = "raze__tokio_tls__0_3_1", + url = "https://crates.io/api/v1/crates/tokio-tls/0.3.1/download", + type = "tar.gz", + sha256 = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343", + strip_prefix = "tokio-tls-0.3.1", + build_file = Label("//cargo/remote:BUILD.tokio-tls-0.3.1.bazel"), + ) + maybe( http_archive, name = "raze__tokio_util__0_3_1", @@ -2601,6 +2661,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.webpki-0.21.3.bazel"), ) + maybe( + http_archive, + name = "raze__webpki_roots__0_20_0", + url = "https://crates.io/api/v1/crates/webpki-roots/0.20.0/download", + type = "tar.gz", + sha256 = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f", + strip_prefix = "webpki-roots-0.20.0", + build_file = Label("//cargo/remote:BUILD.webpki-roots-0.20.0.bazel"), + ) + maybe( http_archive, name = "raze__which__4_0_2", diff --git a/cargo/licenses.json b/cargo/licenses.json index f5957beb2..6f18c5f62 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -298,7 +298,7 @@ }, { "name": "core-foundation", - "version": "0.7.0", + "version": "0.9.1", "authors": "The Servo Project Developers", "repository": "https://github.com/servo/core-foundation-rs", "license": "Apache-2.0/MIT", @@ -307,7 +307,7 @@ }, { "name": "core-foundation-sys", - "version": "0.7.0", + "version": "0.8.2", "authors": "The Servo Project Developers", "repository": "https://github.com/servo/core-foundation-rs", "license": "Apache-2.0/MIT", @@ -539,6 +539,24 @@ "license_file": null, "description": "Fowler–Noll–Vo hash function" }, + { + "name": "foreign-types", + "version": "0.3.2", + "authors": "Steven Fackler ", + "repository": "https://github.com/sfackler/foreign-types", + "license": "Apache-2.0/MIT", + "license_file": null, + "description": "A framework for Rust wrappers over C APIs" + }, + { + "name": "foreign-types-shared", + "version": "0.1.1", + "authors": "Steven Fackler ", + "repository": "https://github.com/sfackler/foreign-types", + "license": "Apache-2.0/MIT", + "license_file": null, + "description": "An internal crate used by foreign-types" + }, { "name": "form_urlencoded", "version": "1.0.0", @@ -836,6 +854,15 @@ "license_file": null, "description": "A connect, read and write timeout aware connector to be used with hyper Client." }, + { + "name": "hyper-tls", + "version": "0.4.3", + "authors": "Sean McArthur ", + "repository": "https://github.com/hyperium/hyper-tls", + "license": "Apache-2.0/MIT", + "license_file": null, + "description": "Default TLS implementation for use with hyper" + }, { "name": "idna", "version": "0.2.0", @@ -1106,6 +1133,15 @@ "license_file": null, "description": "A multimap implementation." }, + { + "name": "native-tls", + "version": "0.2.6", + "authors": "Steven Fackler ", + "repository": "https://github.com/sfackler/rust-native-tls", + "license": "Apache-2.0/MIT", + "license_file": null, + "description": "A wrapper over a platform's native TLS implementation" + }, { "name": "net2", "version": "0.2.35", @@ -1205,6 +1241,15 @@ "license_file": null, "description": "Single assignment cells and lazy values." }, + { + "name": "openssl", + "version": "0.10.30", + "authors": "Steven Fackler ", + "repository": "https://github.com/sfackler/rust-openssl", + "license": "Apache-2.0", + "license_file": null, + "description": "OpenSSL bindings" + }, { "name": "openssl-probe", "version": "0.1.2", @@ -1214,6 +1259,15 @@ "license_file": null, "description": "Tool for helping to find SSL certificate locations on the system for OpenSSL" }, + { + "name": "openssl-sys", + "version": "0.9.58", + "authors": "Alex Crichton |Steven Fackler ", + "repository": "https://github.com/sfackler/rust-openssl", + "license": "MIT", + "license_file": null, + "description": "FFI bindings to OpenSSL" + }, { "name": "parking_lot", "version": "0.11.0", @@ -1610,15 +1664,6 @@ "license_file": null, "description": "Rustls is a modern TLS library written in Rust." }, - { - "name": "rustls-native-certs", - "version": "0.4.0", - "authors": "Joseph Birr-Pixton ", - "repository": "https://github.com/ctz/rustls-native-certs", - "license": "Apache-2.0/ISC/MIT", - "license_file": null, - "description": "rustls-native-certs allows rustls to use the platform native certificate store" - }, { "name": "ryu", "version": "1.0.5", @@ -1657,7 +1702,7 @@ }, { "name": "security-framework", - "version": "1.0.0", + "version": "2.0.0", "authors": "Steven Fackler |Kornel ", "repository": "https://github.com/kornelski/rust-security-framework", "license": "MIT OR Apache-2.0", @@ -1666,7 +1711,7 @@ }, { "name": "security-framework-sys", - "version": "1.0.0", + "version": "2.0.0", "authors": "Steven Fackler |Kornel ", "repository": "https://github.com/kornelski/rust-security-framework", "license": "MIT OR Apache-2.0", @@ -2024,6 +2069,15 @@ "license_file": null, "description": "Asynchronous SOCKS proxy support for Rust." }, + { + "name": "tokio-tls", + "version": "0.3.1", + "authors": "Tokio Contributors ", + "repository": "https://github.com/tokio-rs/tokio", + "license": "MIT", + "license_file": null, + "description": "Deprecated in favor of `tokio-naitve-tls`. An implementation of TLS/SSL streams for Tokio giving an implementation of TLS for nonblocking I/O streams." + }, { "name": "tokio-util", "version": "0.3.1", @@ -2339,6 +2393,15 @@ "license_file": "LICENSE", "description": "Web PKI X.509 Certificate Verification." }, + { + "name": "webpki-roots", + "version": "0.20.0", + "authors": "Joseph Birr-Pixton ", + "repository": "https://github.com/ctz/webpki-roots", + "license": "MPL-2.0", + "license_file": null, + "description": "Mozilla's CA root certificates for use with webpki" + }, { "name": "which", "version": "4.0.2", diff --git a/cargo/remote/BUILD.core-foundation-0.7.0.bazel b/cargo/remote/BUILD.core-foundation-0.9.1.bazel similarity index 92% rename from cargo/remote/BUILD.core-foundation-0.7.0.bazel rename to cargo/remote/BUILD.core-foundation-0.9.1.bazel index b50d5e610..943ce6b57 100644 --- a/cargo/remote/BUILD.core-foundation-0.7.0.bazel +++ b/cargo/remote/BUILD.core-foundation-0.9.1.bazel @@ -45,10 +45,10 @@ rust_library( "cargo-raze", "manual", ], - version = "0.7.0", + version = "0.9.1", # buildifier: leave-alone deps = [ - "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", + "@raze__core_foundation_sys__0_8_2//:core_foundation_sys", "@raze__libc__0_2_80//:libc", ], ) diff --git a/cargo/remote/BUILD.core-foundation-sys-0.7.0.bazel b/cargo/remote/BUILD.core-foundation-sys-0.8.2.bazel similarity index 97% rename from cargo/remote/BUILD.core-foundation-sys-0.7.0.bazel rename to cargo/remote/BUILD.core-foundation-sys-0.8.2.bazel index 38e5113fd..2f5fd0070 100644 --- a/cargo/remote/BUILD.core-foundation-sys-0.7.0.bazel +++ b/cargo/remote/BUILD.core-foundation-sys-0.8.2.bazel @@ -51,7 +51,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.7.0", + version = "0.8.2", visibility = ["//visibility:private"], deps = [ ], @@ -72,7 +72,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.7.0", + version = "0.8.2", # buildifier: leave-alone deps = [ ":core_foundation_sys_build_script", diff --git a/cargo/remote/BUILD.foreign-types-0.3.2.bazel b/cargo/remote/BUILD.foreign-types-0.3.2.bazel new file mode 100644 index 000000000..ec8b86227 --- /dev/null +++ b/cargo/remote/BUILD.foreign-types-0.3.2.bazel @@ -0,0 +1,53 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +rust_library( + name = "foreign_types", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.3.2", + # buildifier: leave-alone + deps = [ + "@raze__foreign_types_shared__0_1_1//:foreign_types_shared", + ], +) diff --git a/cargo/remote/BUILD.foreign-types-shared-0.1.1.bazel b/cargo/remote/BUILD.foreign-types-shared-0.1.1.bazel new file mode 100644 index 000000000..ac981978e --- /dev/null +++ b/cargo/remote/BUILD.foreign-types-shared-0.1.1.bazel @@ -0,0 +1,52 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +rust_library( + name = "foreign_types_shared", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.1.1", + # buildifier: leave-alone + deps = [ + ], +) diff --git a/cargo/remote/BUILD.hyper-tls-0.4.3.bazel b/cargo/remote/BUILD.hyper-tls-0.4.3.bazel new file mode 100644 index 000000000..5e97d29ab --- /dev/null +++ b/cargo/remote/BUILD.hyper-tls-0.4.3.bazel @@ -0,0 +1,59 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "client" with type "example" omitted + +rust_library( + name = "hyper_tls", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.4.3", + # buildifier: leave-alone + deps = [ + "@raze__bytes__0_5_6//:bytes", + "@raze__hyper__0_13_9//:hyper", + "@raze__native_tls__0_2_6//:native_tls", + "@raze__tokio__0_2_23//:tokio", + "@raze__tokio_tls__0_3_1//:tokio_tls", + ], +) diff --git a/cargo/remote/BUILD.native-tls-0.2.6.bazel b/cargo/remote/BUILD.native-tls-0.2.6.bazel new file mode 100644 index 000000000..f1273e5dd --- /dev/null +++ b/cargo/remote/BUILD.native-tls-0.2.6.bazel @@ -0,0 +1,150 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "native_tls_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.2.6", + visibility = ["//visibility:private"], + deps = [ + ] + selects.with_or({ + # cfg(any(target_os = "macos", target_os = "ios")) + ( + "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:i686-apple-darwin", + "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", + "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", + ): [ + "@raze__security_framework_sys__2_0_0//:security_framework_sys", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios"))) + ( + "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu", + "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", + ): [ + "@raze__openssl_sys__0_9_58//:openssl_sys", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(target_os = "windows") + ( + "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", + "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + ], + "//conditions:default": [], + }), +) + +# Unsupported target "google-connect" with type "example" omitted + +# Unsupported target "simple-server" with type "example" omitted + +rust_library( + name = "native_tls", + srcs = glob(["**/*.rs"]), + aliases = { + }, + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.2.6", + # buildifier: leave-alone + deps = [ + ":native_tls_build_script", + ] + selects.with_or({ + # cfg(any(target_os = "macos", target_os = "ios")) + ( + "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:i686-apple-darwin", + "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", + "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", + ): [ + "@raze__lazy_static__1_4_0//:lazy_static", + "@raze__libc__0_2_80//:libc", + "@raze__security_framework__2_0_0//:security_framework", + "@raze__security_framework_sys__2_0_0//:security_framework_sys", + "@raze__tempfile__3_1_0//:tempfile", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios"))) + ( + "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu", + "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", + ): [ + "@raze__log__0_4_11//:log", + "@raze__openssl__0_10_30//:openssl", + "@raze__openssl_probe__0_1_2//:openssl_probe", + "@raze__openssl_sys__0_9_58//:openssl_sys", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(target_os = "windows") + ( + "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", + "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + "@raze__schannel__0_1_19//:schannel", + ], + "//conditions:default": [], + }), +) diff --git a/cargo/remote/BUILD.openssl-0.10.30.bazel b/cargo/remote/BUILD.openssl-0.10.30.bazel new file mode 100644 index 000000000..6782a057c --- /dev/null +++ b/cargo/remote/BUILD.openssl-0.10.30.bazel @@ -0,0 +1,89 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0" +]) + +# Generated Targets# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "openssl_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.10.30", + visibility = ["//visibility:private"], + deps = [ + "@raze__openssl_sys__0_9_58//:openssl_sys", + ], +) + +# Unsupported target "mk_certs" with type "example" omitted + +rust_library( + name = "openssl", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.10.30", + # buildifier: leave-alone + deps = [ + ":openssl_build_script", + "@raze__bitflags__1_2_1//:bitflags", + "@raze__cfg_if__0_1_10//:cfg_if", + "@raze__foreign_types__0_3_2//:foreign_types", + "@raze__lazy_static__1_4_0//:lazy_static", + "@raze__libc__0_2_80//:libc", + "@raze__openssl_sys__0_9_58//:openssl_sys", + ], +) diff --git a/cargo/remote/BUILD.openssl-sys-0.9.58.bazel b/cargo/remote/BUILD.openssl-sys-0.9.58.bazel new file mode 100644 index 000000000..b32e690c9 --- /dev/null +++ b/cargo/remote/BUILD.openssl-sys-0.9.58.bazel @@ -0,0 +1,103 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "openssl_sys_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build/main.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.9.58", + visibility = ["//visibility:private"], + deps = [ + "@raze__autocfg__1_0_1//:autocfg", + "@raze__cc__1_0_62//:cc", + "@raze__pkg_config__0_3_19//:pkg_config", + ] + selects.with_or({ + # cfg(target_env = "msvc") + ( + "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", + "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + "@raze__vcpkg__0_2_10//:vcpkg", + ], + "//conditions:default": [], + }), +) + +rust_library( + name = "openssl_sys", + srcs = glob(["**/*.rs"]), + aliases = { + }, + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.9.58", + # buildifier: leave-alone + deps = [ + ":openssl_sys_build_script", + "@raze__libc__0_2_80//:libc", + ] + selects.with_or({ + # cfg(target_env = "msvc") + ( + "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", + "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + ], + "//conditions:default": [], + }), +) diff --git a/cargo/remote/BUILD.reqwest-0.10.8.bazel b/cargo/remote/BUILD.reqwest-0.10.8.bazel index fd77f7e2f..ca736328f 100644 --- a/cargo/remote/BUILD.reqwest-0.10.8.bazel +++ b/cargo/remote/BUILD.reqwest-0.10.8.bazel @@ -46,20 +46,27 @@ rust_library( name = "reqwest", srcs = glob(["**/*.rs"]), aliases = { + "@raze__native_tls__0_2_6//:native_tls": "native_tls_crate", }, crate_features = [ "__rustls", "__tls", + "default-tls", "hyper-rustls", + "hyper-tls", "json", + "native-tls", + "native-tls-crate", "rustls", - "rustls-native-certs", - "rustls-tls-native-roots", + "rustls-tls", + "rustls-tls-webpki-roots", "serde_json", "socks", "stream", "tokio-rustls", "tokio-socks", + "tokio-tls", + "webpki-roots", ], crate_root = "src/lib.rs", crate_type = "lib", @@ -101,17 +108,20 @@ rust_library( "@raze__http_body__0_3_1//:http_body", "@raze__hyper__0_13_9//:hyper", "@raze__hyper_rustls__0_21_0//:hyper_rustls", + "@raze__hyper_tls__0_4_3//:hyper_tls", "@raze__ipnet__2_3_0//:ipnet", "@raze__lazy_static__1_4_0//:lazy_static", "@raze__log__0_4_11//:log", "@raze__mime__0_3_16//:mime", + "@raze__native_tls__0_2_6//:native_tls", "@raze__percent_encoding__2_1_0//:percent_encoding", "@raze__pin_project_lite__0_1_11//:pin_project_lite", "@raze__rustls__0_18_1//:rustls", - "@raze__rustls_native_certs__0_4_0//:rustls_native_certs", "@raze__tokio__0_2_23//:tokio", "@raze__tokio_rustls__0_14_1//:tokio_rustls", "@raze__tokio_socks__0_3_0//:tokio_socks", + "@raze__tokio_tls__0_3_1//:tokio_tls", + "@raze__webpki_roots__0_20_0//:webpki_roots", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.security-framework-1.0.0.bazel b/cargo/remote/BUILD.security-framework-2.0.0.bazel similarity index 86% rename from cargo/remote/BUILD.security-framework-1.0.0.bazel rename to cargo/remote/BUILD.security-framework-2.0.0.bazel index 5486bbbe3..8207b0d7e 100644 --- a/cargo/remote/BUILD.security-framework-1.0.0.bazel +++ b/cargo/remote/BUILD.security-framework-2.0.0.bazel @@ -53,13 +53,13 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.0", + version = "2.0.0", # buildifier: leave-alone deps = [ "@raze__bitflags__1_2_1//:bitflags", - "@raze__core_foundation__0_7_0//:core_foundation", - "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", + "@raze__core_foundation__0_9_1//:core_foundation", + "@raze__core_foundation_sys__0_8_2//:core_foundation_sys", "@raze__libc__0_2_80//:libc", - "@raze__security_framework_sys__1_0_0//:security_framework_sys", + "@raze__security_framework_sys__2_0_0//:security_framework_sys", ], ) diff --git a/cargo/remote/BUILD.security-framework-sys-1.0.0.bazel b/cargo/remote/BUILD.security-framework-sys-2.0.0.bazel similarity index 90% rename from cargo/remote/BUILD.security-framework-sys-1.0.0.bazel rename to cargo/remote/BUILD.security-framework-sys-2.0.0.bazel index 24bd9d4bc..dc90a3b6c 100644 --- a/cargo/remote/BUILD.security-framework-sys-1.0.0.bazel +++ b/cargo/remote/BUILD.security-framework-sys-2.0.0.bazel @@ -35,6 +35,7 @@ rust_library( srcs = glob(["**/*.rs"]), crate_features = [ "OSX_10_9", + "default", ], crate_root = "src/lib.rs", crate_type = "lib", @@ -46,10 +47,10 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.0", + version = "2.0.0", # buildifier: leave-alone deps = [ - "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", + "@raze__core_foundation_sys__0_8_2//:core_foundation_sys", "@raze__libc__0_2_80//:libc", ], ) diff --git a/cargo/remote/BUILD.rustls-native-certs-0.4.0.bazel b/cargo/remote/BUILD.tokio-tls-0.3.1.bazel similarity index 74% rename from cargo/remote/BUILD.rustls-native-certs-0.4.0.bazel rename to cargo/remote/BUILD.tokio-tls-0.3.1.bazel index 25eb62178..cce2cc283 100644 --- a/cargo/remote/BUILD.rustls-native-certs-0.4.0.bazel +++ b/cargo/remote/BUILD.tokio-tls-0.3.1.bazel @@ -25,15 +25,17 @@ package(default_visibility = [ ]) licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR (ISC OR MIT)" + "notice", # MIT from expression "MIT" ]) # Generated Targets -# Unsupported target "google" with type "example" omitted +# Unsupported target "download-rust-lang" with type "example" omitted + +# Unsupported target "tls-echo" with type "example" omitted rust_library( - name = "rustls_native_certs", + name = "tokio_tls", srcs = glob(["**/*.rs"]), aliases = { }, @@ -49,28 +51,27 @@ rust_library( "cargo-raze", "manual", ], - version = "0.4.0", + version = "0.3.1", # buildifier: leave-alone deps = [ - "@raze__rustls__0_18_1//:rustls", + "@raze__native_tls__0_2_6//:native_tls", + "@raze__tokio__0_2_23//:tokio", ] + selects.with_or({ - # cfg(all(unix, not(target_os = "macos"))) + # cfg(all(not(target_os = "macos"), not(windows), not(target_os = "ios"))) ( - "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu", - "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__openssl_probe__0_1_2//:openssl_probe", ], "//conditions:default": [], }) + selects.with_or({ - # cfg(target_os = "macos") + # cfg(any(target_os = "macos", target_os = "ios")) ( + "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", "@io_bazel_rules_rust//rust/platform:i686-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", + "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", ): [ - "@raze__security_framework__1_0_0//:security_framework", ], "//conditions:default": [], }) + selects.with_or({ @@ -79,12 +80,13 @@ rust_library( "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", ): [ - "@raze__schannel__0_1_19//:schannel", ], "//conditions:default": [], }), ) -# Unsupported target "compare_mozilla" with type "test" omitted +# Unsupported target "bad" with type "test" omitted -# Unsupported target "smoketests" with type "test" omitted +# Unsupported target "google" with type "test" omitted + +# Unsupported target "smoke" with type "test" omitted diff --git a/cargo/remote/BUILD.webpki-roots-0.20.0.bazel b/cargo/remote/BUILD.webpki-roots-0.20.0.bazel new file mode 100644 index 000000000..32a0cf125 --- /dev/null +++ b/cargo/remote/BUILD.webpki-roots-0.20.0.bazel @@ -0,0 +1,78 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "reciprocal", # MPL-2.0 from expression "MPL-2.0" +]) + +# Generated Targets + +rust_binary( + # Prefix bin name to disambiguate from (probable) collision with lib name + # N.B.: The exact form of this is subject to change. + name = "cargo_bin_process_cert", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/bin/process_cert.rs", + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.20.0", + # buildifier: leave-alone + deps = [ + # Binaries get an implicit dependency on their crate's lib + ":webpki_roots", + "@raze__webpki__0_21_3//:webpki", + ], +) + +rust_library( + name = "webpki_roots", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.20.0", + # buildifier: leave-alone + deps = [ + "@raze__webpki__0_21_3//:webpki", + ], +) diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 6dd5d0642..27e1cbf9b 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -53,7 +53,7 @@ pin-project = "1" prost = { git = "https://github.com/danburkert/prost.git", rev = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b" } rand = "0.7.3" regex = "1.3.9" -reqwest = { git = "https://github.com/ankitects/reqwest.git", tag = "anki-2020-11-03", default-features = false, features = ["json", "socks", "stream", "rustls-tls-native-roots"] } +reqwest = { git = "https://github.com/ankitects/reqwest.git", tag = "anki-2020-11-03", default-features = false, features = ["json", "socks", "stream", "rustls-tls", "native-tls"] } rusqlite = { version = "0.24.1", features = ["trace", "functions", "collation", "bundled" ] } scopeguard = "1.1.0" serde = "1.0.114"