Commit 8f750a0f authored by Wohlgemuth, Jason's avatar Wohlgemuth, Jason
Browse files

fix: Update reqwest TLS feature

parent c1c71e85

Cargo.lock

+124 −203
Original line number Diff line number Diff line
@@ -295,28 +295,6 @@ version = "1.5.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"



[[package]]

name = "aws-lc-rs"

version = "1.16.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d9a7b350e3bb1767102698302bc37256cbd48422809984b98d292c40e2579aa9"

dependencies = [

 "aws-lc-sys",

 "zeroize",

]



[[package]]

name = "aws-lc-sys"

version = "0.37.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549"

dependencies = [

 "cc",

 "cmake",

 "dunce",

 "fs_extra",

]



[[package]]

name = "backtrace"

version = "0.3.76"
@@ -556,17 +534,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"

dependencies = [

 "find-msvc-tools",

 "jobserver",

 "libc",

 "shlex",

]



[[package]]

name = "cesu8"

version = "1.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"



[[package]]

name = "cfg-if"

version = "1.0.4"
@@ -666,15 +636,6 @@ dependencies = [ 
 "windows 0.56.0",

]



[[package]]

name = "cmake"

version = "0.1.57"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"

dependencies = [

 "cc",

]



[[package]]

name = "color-eyre"

version = "0.6.5"
@@ -694,16 +655,6 @@ version = "1.0.4" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"



[[package]]

name = "combine"

version = "4.6.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"

dependencies = [

 "bytes",

 "memchr",

]



[[package]]

name = "comfy-table"

version = "7.2.2"
@@ -1246,12 +1197,6 @@ dependencies = [ 
 "shared_thread",

]



[[package]]

name = "dunce"

version = "1.0.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"



[[package]]

name = "dyn-clone"

version = "1.0.20"
@@ -1360,6 +1305,12 @@ version = "0.2.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f8eb564c5c7423d25c886fb561d1e4ee69f72354d16918afa32c08811f6b6a55"



[[package]]

name = "fastrand"

version = "2.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"



[[package]]

name = "filetime"

version = "0.2.27"
@@ -1425,6 +1376,21 @@ version = "0.2.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"



[[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.2.2"
@@ -1434,12 +1400,6 @@ dependencies = [ 
 "percent-encoding",

]



[[package]]

name = "fs_extra"

version = "1.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"



[[package]]

name = "futf"

version = "0.1.5"
@@ -1855,6 +1815,22 @@ dependencies = [ 
 "tower-service",

]



[[package]]

name = "hyper-tls"

version = "0.6.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"

dependencies = [

 "bytes",

 "http-body-util",

 "hyper",

 "hyper-util",

 "native-tls",

 "tokio",

 "tokio-native-tls",

 "tower-service",

]



[[package]]

name = "hyper-util"

version = "0.1.20"
@@ -2152,38 +2128,6 @@ version = "0.5.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e"



[[package]]

name = "jni"

version = "0.21.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"

dependencies = [

 "cesu8",

 "cfg-if",

 "combine",

 "jni-sys",

 "log",

 "thiserror 1.0.69",

 "walkdir",

 "windows-sys 0.45.0",

]



[[package]]

name = "jni-sys"

version = "0.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"



[[package]]

name = "jobserver"

version = "0.1.34"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"

dependencies = [

 "getrandom 0.3.4",

 "libc",

]



[[package]]

name = "js-sys"

version = "0.3.85"
@@ -2443,6 +2387,23 @@ dependencies = [ 
 "getrandom 0.2.17",

]



[[package]]

name = "native-tls"

version = "0.2.18"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"

dependencies = [

 "libc",

 "log",

 "openssl",

 "openssl-probe",

 "openssl-sys",

 "schannel",

 "security-framework",

 "security-framework-sys",

 "tempfile",

]



[[package]]

name = "new_debug_unreachable"

version = "1.0.6"
@@ -2629,12 +2590,50 @@ dependencies = [ 
 "pkg-config",

]



[[package]]

name = "openssl"

version = "0.10.75"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"

dependencies = [

 "bitflags",

 "cfg-if",

 "foreign-types",

 "libc",

 "once_cell",

 "openssl-macros",

 "openssl-sys",

]



[[package]]

name = "openssl-macros"

version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.116",

]



[[package]]

name = "openssl-probe"

version = "0.2.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"



[[package]]

name = "openssl-sys"

version = "0.9.111"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"

dependencies = [

 "cc",

 "libc",

 "pkg-config",

 "vcpkg",

]



[[package]]

name = "option-ext"

version = "0.2.0"
@@ -3435,7 +3434,6 @@ version = "0.11.13" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"

dependencies = [

 "aws-lc-rs",

 "bytes",

 "getrandom 0.3.4",

 "lru-slab",
@@ -3733,21 +3731,19 @@ dependencies = [ 
 "http-body",

 "http-body-util",

 "hyper",

 "hyper-rustls",

 "hyper-tls",

 "hyper-util",

 "js-sys",

 "log",

 "native-tls",

 "percent-encoding",

 "pin-project-lite",

 "quinn",

 "rustls",

 "rustls-pki-types",

 "rustls-platform-verifier",

 "serde",

 "serde_json",

 "sync_wrapper",

 "tokio",

 "tokio-rustls",

 "tokio-native-tls",

 "tower",

 "tower-http",

 "tower-service",
@@ -3878,7 +3874,6 @@ version = "0.23.36" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"

dependencies = [

 "aws-lc-rs",

 "log",

 "once_cell",

 "ring",
@@ -3910,40 +3905,12 @@ dependencies = [ 
 "zeroize",

]



[[package]]

name = "rustls-platform-verifier"

version = "0.6.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"

dependencies = [

 "core-foundation",

 "core-foundation-sys",

 "jni",

 "log",

 "once_cell",

 "rustls",

 "rustls-native-certs",

 "rustls-platform-verifier-android",

 "rustls-webpki",

 "security-framework",

 "security-framework-sys",

 "webpki-root-certs",

 "windows-sys 0.52.0",

]



[[package]]

name = "rustls-platform-verifier-android"

version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"



[[package]]

name = "rustls-webpki"

version = "0.103.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"

dependencies = [

 "aws-lc-rs",

 "ring",

 "rustls-pki-types",

 "untrusted",
@@ -4600,6 +4567,19 @@ dependencies = [ 
 "libc",

]



[[package]]

name = "tempfile"

version = "3.25.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1"

dependencies = [

 "fastrand",

 "getrandom 0.3.4",

 "once_cell",

 "rustix",

 "windows-sys 0.52.0",

]



[[package]]

name = "tendril"

version = "0.4.3"
@@ -4795,6 +4775,16 @@ dependencies = [ 
 "syn 2.0.116",

]



[[package]]

name = "tokio-native-tls"

version = "0.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"

dependencies = [

 "native-tls",

 "tokio",

]



[[package]]

name = "tokio-rustls"

version = "0.26.4"
@@ -5167,6 +5157,12 @@ dependencies = [ 
 "syn 2.0.116",

]



[[package]]

name = "vcpkg"

version = "0.2.15"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"



[[package]]

name = "version-ranges"

version = "0.1.2"
@@ -5372,15 +5368,6 @@ dependencies = [ 
 "string_cache_codegen",

]



[[package]]

name = "webpki-root-certs"

version = "1.0.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca"

dependencies = [

 "rustls-pki-types",

]



[[package]]

name = "webpki-roots"

version = "1.0.6"
@@ -5624,15 +5611,6 @@ dependencies = [ 
 "windows-link 0.2.1",

]



[[package]]

name = "windows-sys"

version = "0.45.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"

dependencies = [

 "windows-targets 0.42.2",

]



[[package]]

name = "windows-sys"

version = "0.52.0"
@@ -5669,21 +5647,6 @@ dependencies = [ 
 "windows-link 0.2.1",

]



[[package]]

name = "windows-targets"

version = "0.42.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"

dependencies = [

 "windows_aarch64_gnullvm 0.42.2",

 "windows_aarch64_msvc 0.42.2",

 "windows_i686_gnu 0.42.2",

 "windows_i686_msvc 0.42.2",

 "windows_x86_64_gnu 0.42.2",

 "windows_x86_64_gnullvm 0.42.2",

 "windows_x86_64_msvc 0.42.2",

]



[[package]]

name = "windows-targets"

version = "0.52.6"
@@ -5726,12 +5689,6 @@ dependencies = [ 
 "windows-link 0.1.3",

]



[[package]]

name = "windows_aarch64_gnullvm"

version = "0.42.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"



[[package]]

name = "windows_aarch64_gnullvm"

version = "0.52.6"
@@ -5744,12 +5701,6 @@ version = "0.53.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"



[[package]]

name = "windows_aarch64_msvc"

version = "0.42.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"



[[package]]

name = "windows_aarch64_msvc"

version = "0.52.6"
@@ -5762,12 +5713,6 @@ version = "0.53.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"



[[package]]

name = "windows_i686_gnu"

version = "0.42.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"



[[package]]

name = "windows_i686_gnu"

version = "0.52.6"
@@ -5792,12 +5737,6 @@ version = "0.53.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"



[[package]]

name = "windows_i686_msvc"

version = "0.42.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"



[[package]]

name = "windows_i686_msvc"

version = "0.52.6"
@@ -5810,12 +5749,6 @@ version = "0.53.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"



[[package]]

name = "windows_x86_64_gnu"

version = "0.42.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"



[[package]]

name = "windows_x86_64_gnu"

version = "0.52.6"
@@ -5828,12 +5761,6 @@ version = "0.53.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"



[[package]]

name = "windows_x86_64_gnullvm"

version = "0.42.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"



[[package]]

name = "windows_x86_64_gnullvm"

version = "0.52.6"
@@ -5846,12 +5773,6 @@ version = "0.53.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"



[[package]]

name = "windows_x86_64_msvc"

version = "0.42.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"



[[package]]

name = "windows_x86_64_msvc"

version = "0.52.6"

Cargo.toml

+19 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
members = ["xylem-cli", "xylem-lib"]

resolver = "2"



[profile.release]

debug = true



[workspace.package]

version = "0.1.0"

license = "MIT"
@@ -14,6 +11,16 @@ documentation = "https://xylem.ornl.gov" 
readme = "README.md"

homepage = "https://xylem.ornl.gov"

repository = "https://code.ornl.gov/research-enablement/xylem"

keywords = ["research", "automation"]

exclude = [".vale", ".vscode"]



[workspace.lints.rust]

missing-docs = "deny"

rust-2018-idioms = "warn"

unsafe_code = "forbid"



[workspace.lints.rustdoc]

broken-intra-doc-links = "forbid"



[workspace.dependencies]

acorn-lib = { version = "0.1.50", features = ["std", "analyzer"], default-features = false }
@@ -37,3 +44,12 @@ uriparse = { version = "0.6.4", default-features = false } 
[workspace.metadata.cross.build]

default-target = "x86_64-unknown-linux-musl"

debug-assertions = true



[profile.release]

debug = true

codegen-units = 1

opt-level = "s"

overflow-checks = true

panic = "abort"

strip = true

lto = true

Makefile

+15 −6
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ audit: 
		--ignore RUSTSEC-2024-0388 \

		--ignore RUSTSEC-2024-0436



build: clean

	@mkdir -p ./bin

	@cargo build --release --package xylem-cli --target $(DEFAULT_TARGET)

	@mv target/$(DEFAULT_TARGET)/release/xylem ./bin/xylem-v$(VERSION)

	@pwsh -Command New-Item -ItemType Directory -Path ".\bin" -Force

	@cargo build --release --package acorn-cli --target $(DEFAULT_WINDOWS_TARGET)

	@pwsh -Command Move-Item -Path "target\$(DEFAULT_WINDOWS_TARGET)\release\acorn.exe" -Destination ".\bin\acorn-v${VERSION}.exe"



clean:

	@rm -rf ./bin

	@cargo clean
@@ -47,11 +55,6 @@ doc: 
	@cargo clean --doc

	@cargo doc --no-deps --all-features



build: clean

	@mkdir -p ./bin

	@cargo build --release --target $(DEFAULT_TARGET)

	@mv target/$(DEFAULT_TARGET)/release/xylem ./bin/xylem-v$(VERSION)



build-cross: clean

	@mkdir -p ./bin

	@for target in $(TARGETS) ; do \
@@ -70,13 +73,19 @@ version: 
#

VERSION = `awk -F ' = ' '$$1 ~ /version/ { gsub(/["]/, "", $$2); printf("%s",$$2) }' Cargo.toml`

DEFAULT_TARGET = `awk -F ' = ' '$$1 ~ /default-target/ { gsub(/["]/, "", $$2); printf("%s",$$2) }' Cargo.toml | tr . _`

DEFAULT_WINDOWS_TARGET = x86_64-pc-windows-gnu

DEV_DEPENDENCIES = \

	cargo-audit \

	cargo-auditable \

	cargo-deny \

	cargo-insta \

	cargo-nextest \

	cargo-shear \

	cargo-tarpaulin \

	cargo-udeps

	cargo-udeps \

	mdbook \

	mdbook-mermaid \

	mdbook-pikchr

TARGETS = \

	i586-unknown-linux-musl \

	i686-unknown-linux-gnu \

xylem-lib/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ derive_more = { version = "2.0.1", features = ["display", "from_str"], default-f 
fancy-regex = { version = "0.17.0", default-features = false }

is_executable = { version = "1.0.5", default-features = false }

pyproject-toml = { version = "0.13.7", default-features = false }

reqwest = { version = "0.13.2", features = ["blocking", "rustls", "json"], default-features = false }

reqwest = { version = "0.13.2", features = ["blocking", "native-tls", "json"], default-features = false }

serde_yml = { version = "0.0.12", default-features = false }

sha2 = { version = "0.10.9", default-features = false }

tokio = { version = "1.48.0", features = ["rt", "time", "rt-multi-thread"], default-features = false }