Skip to content

Commit

Permalink
fix: Use older version of x509-certificate for wasm32-unknown (#934)
Browse files Browse the repository at this point in the history
x509-certificate v0.22.0 uses a newer version of ring (0.17.5) which
cannot be built by Xcode on Mac Silicon for wasm32-unknown-unknown.
  • Loading branch information
cdmurph32 authored Feb 19, 2025
1 parent c6d58b8 commit bd737c8
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 16 deletions.
82 changes: 69 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions internal/crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ sha2 = "0.10.6"
spki = { version = "0.7.3", optional = true }
thiserror = "2.0.8"
web-time = "1.1"
x509-certificate = "0.23.1"
x509-parser = "0.16.0"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand All @@ -99,6 +98,9 @@ version = "0.4.39"
default-features = false
features = ["now"]

[target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies]
x509-certificate = "0.23.1"

[target.'cfg(target_arch = "wasm32")'.dependencies]
async-trait = "0.1.77"
const-oid = "0.9.6"
Expand All @@ -110,9 +112,9 @@ rsa = { version = "0.9.7", features = ["pem", "sha2"] }
spki = "0.7.3"

[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies]
x509-certificate = "0.21.0"
getrandom = { version = "0.2.7", features = ["js"] }
js-sys = "0.3.58"
ring = { version = "0.17", features = ["wasm32_unknown_unknown_js"]}
wasm-bindgen = "0.2.83"
wasm-bindgen-futures = "0.4.31"
web-sys = { version = "0.3.58", features = [
Expand Down
3 changes: 2 additions & 1 deletion sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ thiserror = "2.0.8"
treeline = "0.1.0"
url = "2.5.3"
uuid = { version = "=1.12.0", features = ["serde", "v4"] }
x509-certificate = "0.23.1"
x509-parser = "0.16.0"
zip = { version = "2.2.1", default-features = false }

Expand All @@ -136,6 +135,7 @@ tempfile = { version = "3.15", features = ["nightly"] }
ureq = "2.4.0"

[target.'cfg(any(target_os = "wasi", not(target_arch = "wasm32")))'.dependencies]
x509-certificate = "0.23.1"
image = { version = "0.24.7", default-features = false, features = [
"jpeg",
"png",
Expand Down Expand Up @@ -165,6 +165,7 @@ web-sys = { version = "0.3.58", features = [
"Window",
"WorkerGlobalScope",
] }
x509-certificate = "0.21.0"

[dev-dependencies]
anyhow = "1.0.40"
Expand Down

0 comments on commit bd737c8

Please sign in to comment.