Skip to content

Commit

Permalink
chore: remove dependency on a fork of RustCrypto/formats
Browse files Browse the repository at this point in the history
Upstream has made a fix and released a new version of der_derive:
RustCrypto/formats#1443
  • Loading branch information
istankovic authored and SimonThormeyer committed Jul 15, 2024
1 parent 79e006f commit 6c198e4
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ resolver = "2"
[workspace.dependencies]
rexie = "0.6.1"
tls_codec = "0.4.0"
x509-cert = "0.2"

[workspace.dependencies.uniffi]
version = "0.28"
Expand Down Expand Up @@ -69,10 +70,6 @@ git = "https://github.com/wireapp/openmls"
#tag = "v1.0.0-pre.core-crypto-1.0.0"
branch = "wire/stable"

[patch.crates-io.x509-cert]
git = "https://github.com/otak/formats"
branch = "otak/x509-cert-wasm"

# aarch64-apple-ios-sim target support has not yet been released
[patch.crates-io.openssl-src]
git = "https://github.com/alexcrichton/openssl-src-rs.git"
Expand Down
2 changes: 1 addition & 1 deletion crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ schnellru = "0.2"
zeroize = "1.5"
wire-e2e-identity = { workspace = true }
indexmap = "2"
x509-cert = "0.2"
x509-cert = { workspace = true }
pem = "3.0"
async-recursion = "1"
uniffi = { workspace = true, optional = true }
Expand Down
2 changes: 0 additions & 2 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ license-files = [
allow-git = [
# ? Needed for our interop runner.
"https://github.com/otak/fantoccini",
# ? Fix for wasm
"https://github.com/otak/formats?branch=otak/x509-cert-wasm",
# ? Needed for rusqlite
"https://github.com/alexcrichton/openssl-src-rs",
]
Expand Down
2 changes: 1 addition & 1 deletion mls-provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ p384 = { version = "0.13", features = ["pkcs8"] }
p521 = { version = "0.13", features = ["pkcs8"] }
hkdf = "0.12"
spki = { version = "0.7", features = ["pem", "fingerprint"] }
x509-cert = { version = "0.2", features = ["builder", "hazmat"] }
x509-cert = { workspace = true, features = ["builder", "hazmat"] }
wire-e2e-identity = { workspace = true }
fluvio-wasm-timer = "0.2"
rand = { version = "0.8", features = ["getrandom"] }
Expand Down

0 comments on commit 6c198e4

Please sign in to comment.