Skip to content

Commit 0b572d1

Browse files
committed
Enable aead-crypto in wasm and remove cargo patch
1 parent 611ae0b commit 0b572d1

File tree

4 files changed

+16
-42
lines changed

4 files changed

+16
-42
lines changed

Cargo.lock

+14-34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

-6
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,3 @@ codegen-units = 1
8585
# Stripping the binary reduces the size by ~30%, but the stacktraces won't be usable anymore.
8686
# This is fine as long as we don't have any unhandled panics, but let's keep it disabled for now
8787
# strip = true
88-
89-
[patch.crates-io]
90-
pkcs5 = { git = "https://github.com/bitwarden/rustcrypto-formats.git", rev = "2b27c63034217dd126bbf5ed874da51b84f8c705", features = [
91-
"rand_core",
92-
"pbes2",
93-
], package = "pkcs5" }

crates/bitwarden-crypto/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ argon2 = { version = ">=0.5.0, <0.6", features = [
3636
base64 = ">=0.22.1, <0.23"
3737
blake3 = { version = "1.5.5", features = ["zeroize"], optional = true }
3838
cbc = { version = ">=0.1.2, <0.2", features = ["alloc", "zeroize"] }
39-
chacha20 = { version = ">=0.8.2, <0.9", features = [
39+
chacha20 = { version = ">=0.9.1, <0.11.0", features = [
4040
"zeroize",
4141
], optional = true }
4242
chacha20poly1305 = { version = "0.10.1", optional = true }

crates/bitwarden-wasm-internal/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ crate-type = ["cdylib"]
1616

1717
[dependencies]
1818
bitwarden-core = { workspace = true, features = ["wasm", "internal"] }
19-
bitwarden-crypto = { workspace = true, features = ["wasm"] }
19+
bitwarden-crypto = { workspace = true, features = ["wasm", "aead-crypto"] }
2020
bitwarden-error = { version = "1.0.0", path = "../bitwarden-error" }
2121
bitwarden-ssh = { workspace = true, features = ["wasm"] }
2222
bitwarden-vault = { workspace = true, features = ["wasm"] }

0 commit comments

Comments
 (0)